diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
index a344e7b..d6ececa 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
@@ -1169,19 +1169,19 @@
 <td><center>0</center></td>
 <td><center>1</center></td>
 <td><center>0</center></td>
-<td><center>14e</center></td>
+<td><center>148</center></td>
 <td><center>0</center></td>
-<td><center>14c</center></td>
-<td><center>14d</center></td>
-<td><center>108</center></td>
+<td><center>146</center></td>
+<td><center>147</center></td>
+<td><center>104</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>129</center></td>
+<td><center>125</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>128</center></td>
+<td><center>124</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -1202,9 +1202,9 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>109</center></td>
+<td><center>105</center></td>
 <td><center>0</center></td>
-<td><center>10a</center></td>
+<td><center>106</center></td>
 <td><center>c</center></td>
 <td><center>8</center></td>
 <td><center>0</center></td>
@@ -1338,28 +1338,28 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">292</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">293</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">326</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">327</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">334</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">328</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">264</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">260</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -1368,7 +1368,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">265</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">261</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -1377,7 +1377,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">262</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -1971,19 +1971,19 @@
 <td><center>0</center></td>
 <td><center>1</center></td>
 <td><center>0</center></td>
-<td><center>151</center></td>
+<td><center>14b</center></td>
 <td><center>0</center></td>
-<td><center>14f</center></td>
-<td><center>150</center></td>
-<td><center>10b</center></td>
+<td><center>149</center></td>
+<td><center>14a</center></td>
+<td><center>107</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12b</center></td>
+<td><center>127</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12a</center></td>
+<td><center>126</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -2004,9 +2004,9 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10c</center></td>
+<td><center>108</center></td>
 <td><center>0</center></td>
-<td><center>10d</center></td>
+<td><center>109</center></td>
 <td><center>c</center></td>
 <td><center>8</center></td>
 <td><center>0</center></td>
@@ -2138,28 +2138,28 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">298</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">294</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">299</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">295</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">335</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">329</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">336</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">330</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">337</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">331</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">263</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -2168,7 +2168,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">268</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">264</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -2177,7 +2177,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">269</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">265</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -2370,17 +2370,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>150</center></td>
+<td><center>149</center></td>
 <td><center>1ff</center></td>
-<td><center>10b</center></td>
+<td><center>107</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12b</center></td>
+<td><center>127</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12a</center></td>
+<td><center>126</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -2535,18 +2535,18 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">298</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">294</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">299</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">295</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">336</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">329</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">263</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3150,7 +3150,7 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>154</center></td>
+<td><center>14e</center></td>
 <td><center>1ff</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
@@ -3315,7 +3315,7 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">340</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">334</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3546,17 +3546,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>152</center></td>
-<td><center>153</center></td>
-<td><center>10e</center></td>
+<td><center>14c</center></td>
+<td><center>14d</center></td>
+<td><center>10a</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12d</center></td>
+<td><center>129</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12c</center></td>
+<td><center>128</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -3577,7 +3577,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10f</center></td>
+<td><center>10b</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -3712,10 +3712,10 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">300</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">270</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3724,15 +3724,15 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">338</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">301</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">271</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3741,7 +3741,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">339</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3952,17 +3952,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>152</center></td>
-<td><center>153</center></td>
-<td><center>10e</center></td>
+<td><center>14c</center></td>
+<td><center>14d</center></td>
+<td><center>10a</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12d</center></td>
+<td><center>129</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12c</center></td>
+<td><center>128</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -3983,7 +3983,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10f</center></td>
+<td><center>10b</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -4118,10 +4118,10 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">300</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">270</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4130,15 +4130,15 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">338</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">301</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">271</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4147,7 +4147,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">339</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4358,7 +4358,7 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>154</center></td>
+<td><center>14e</center></td>
 <td><center>1ff</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
@@ -4523,7 +4523,7 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">340</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">334</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -5156,17 +5156,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>152</center></td>
-<td><center>153</center></td>
-<td><center>10e</center></td>
+<td><center>14c</center></td>
+<td><center>14d</center></td>
+<td><center>10a</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12d</center></td>
+<td><center>129</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12c</center></td>
+<td><center>128</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -5187,7 +5187,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10f</center></td>
+<td><center>10b</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -5322,10 +5322,10 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">300</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">270</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -5334,15 +5334,15 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">338</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">301</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">271</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -5351,7 +5351,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">339</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -6639,7 +6639,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Tue Sep 12 11:17:02 2017</i>
+<br><i>Created on Wed Sep 13 01:00:44 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>