diff --git a/core/api/src/main/java/org/onosproject/net/config/basics/BasicHostConfig.java b/core/api/src/main/java/org/onosproject/net/config/basics/BasicHostConfig.java
index 17abc53..bba095b 100644
--- a/core/api/src/main/java/org/onosproject/net/config/basics/BasicHostConfig.java
+++ b/core/api/src/main/java/org/onosproject/net/config/basics/BasicHostConfig.java
@@ -56,8 +56,8 @@
                               EthType.EtherType.VLAN.ethType().toShort());
         this.locations();
         this.ipAddresses();
-        return hasOnlyFields(ALLOWED, NAME, LOC_TYPE, LATITUDE, LONGITUDE,
-                             GRID_Y, GRID_Y, UI_TYPE, RACK_ADDRESS, OWNER, IPS, LOCATIONS,
+        return hasOnlyFields(ALLOWED, NAME, LOC_TYPE, LATITUDE, LONGITUDE, ROLES,
+                             GRID_X, GRID_Y, UI_TYPE, RACK_ADDRESS, OWNER, IPS, LOCATIONS,
                              INNER_VLAN, OUTER_TPID);
     }
 
diff --git a/tools/test/topos/wipe-ui-annotations b/tools/test/topos/wipe-ui-annotations
index b6cfd52..99eedc6 100755
--- a/tools/test/topos/wipe-ui-annotations
+++ b/tools/test/topos/wipe-ui-annotations
@@ -7,10 +7,10 @@
 
 host=${1:-$OCI}
 
-onos $host netcfg devices | sed -E 's/("grid[XY]")( : )([-0-9.]*)/\1\20.0/' > $aux
+onos $host netcfg devices | sed -E 's/("locType")( : )(".*")/\1\2"none"/;s/("grid[XY]")( : )([-0-9.]*)/\1\20.0/' > $aux
 onos-netcfg $host $aux devices
 
-onos $host netcfg hosts | sed -E 's/("grid[XY]")( : )([-0-9.]*)/\1\20.0/' > $aux
+onos $host netcfg hosts | sed -E 's/("locType")( : )(".*")/\1\2"none"/;s/("grid[XY]")( : )([-0-9.]*)/\1\20.0/' > $aux
 onos-netcfg $host $aux hosts
 
 rm -f $aux