diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 736dd931e..341e44e99 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -121,64 +121,49 @@ public class GuiGrid extends GuiBase {
 
             String query = searchField.getText().trim().toLowerCase();
 
-            if (!query.isEmpty()) {
-                Iterator<ClientStack> t = items.iterator();
+            Iterator<ClientStack> t = items.iterator();
 
-                while (t.hasNext()) {
-                    ClientStack stack = t.next();
+            while (t.hasNext()) {
+                ClientStack stack = t.next();
 
-                    switch (grid.getViewType()) {
-                        case TileGrid.VIEW_TYPE_NORMAL:
-                            break;
-                        case TileGrid.VIEW_TYPE_NON_CRAFTABLES:
-                            if (stack.isCraftable()) {
-                                t.remove();
+                if (grid.getViewType() == TileGrid.VIEW_TYPE_NON_CRAFTABLES && stack.isCraftable()) {
+                    t.remove();
+                } else if (grid.getViewType() == TileGrid.VIEW_TYPE_CRAFTABLES && !stack.isCraftable()) {
+                    t.remove();
+                }
 
-                                continue;
+                if (query.startsWith("@")) {
+                    String[] parts = query.split(" ");
+
+                    String modId = parts[0].substring(1);
+                    String modIdFromItem = Item.REGISTRY.getNameForObject(stack.getStack().getItem()).getResourceDomain();
+
+                    if (!modIdFromItem.contains(modId)) {
+                        t.remove();
+                    } else if (parts.length >= 2) {
+                        StringBuilder itemFromMod = new StringBuilder();
+
+                        for (int i = 1; i < parts.length; ++i) {
+                            itemFromMod.append(parts[i]);
+
+                            if (i != parts.length - 1) {
+                                itemFromMod.append(" ");
                             }
-                            break;
-                        case TileGrid.VIEW_TYPE_CRAFTABLES:
-                            if (!stack.isCraftable()) {
-                                t.remove();
+                        }
 
-                                continue;
-                            }
-                            break;
+                        if (!stack.getStack().getDisplayName().toLowerCase().contains(itemFromMod.toString())) {
+                            t.remove();
+                        }
                     }
+                } else if (query.startsWith("#")) {
+                    String tooltip = query.substring(1);
+                    String tooltipFromItem = StringUtils.join(stack.getStack().getTooltip(container.getPlayer(), true), "\n");
 
-                    if (query.startsWith("@")) {
-                        String[] parts = query.split(" ");
-
-                        String modId = parts[0].substring(1);
-                        String modIdFromItem = Item.REGISTRY.getNameForObject(stack.getStack().getItem()).getResourceDomain();
-
-                        if (!modIdFromItem.contains(modId)) {
-                            t.remove();
-                        } else if (parts.length >= 2) {
-                            StringBuilder itemFromMod = new StringBuilder();
-
-                            for (int i = 1; i < parts.length; ++i) {
-                                itemFromMod.append(parts[i]);
-
-                                if (i != parts.length - 1) {
-                                    itemFromMod.append(" ");
-                                }
-                            }
-
-                            if (!stack.getStack().getDisplayName().toLowerCase().contains(itemFromMod.toString())) {
-                                t.remove();
-                            }
-                        }
-                    } else if (query.startsWith("#")) {
-                        String tooltip = query.substring(1);
-                        String tooltipFromItem = StringUtils.join(stack.getStack().getTooltip(container.getPlayer(), true), "\n");
-
-                        if (!tooltipFromItem.contains(tooltip)) {
-                            t.remove();
-                        }
-                    } else if (!stack.getStack().getDisplayName().toLowerCase().contains(query)) {
+                    if (!tooltipFromItem.contains(tooltip)) {
                         t.remove();
                     }
+                } else if (!stack.getStack().getDisplayName().toLowerCase().contains(query)) {
+                    t.remove();
                 }
             }
 
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index ea6e4396f..0f8faac0e 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -304,22 +304,22 @@ public class TileGrid extends TileNode implements IGrid {
 
     @Override
     public void onViewTypeChanged(int type) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, sortingDirection, sortingType, searchBoxMode, type));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, type, sortingDirection, sortingType, searchBoxMode));
     }
 
     @Override
     public void onSortingTypeChanged(int type) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, sortingDirection, type, searchBoxMode, viewType));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, viewType, sortingDirection, type, searchBoxMode));
     }
 
     @Override
     public void onSortingDirectionChanged(int direction) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, direction, sortingType, searchBoxMode, viewType));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, viewType, direction, sortingType, searchBoxMode));
     }
 
     @Override
     public void onSearchBoxModeChanged(int searchBoxMode) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, sortingDirection, sortingType, searchBoxMode, viewType));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, viewType, sortingDirection, sortingType, searchBoxMode));
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
index f4d7841d7..782794c8e 100755
--- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
@@ -73,28 +73,28 @@ public class WirelessGrid implements IGrid {
 
     @Override
     public void onViewTypeChanged(int type) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), getSortingType(), getSearchBoxMode(), type));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), type, getSortingDirection(), getSortingType(), getSearchBoxMode()));
 
         this.viewType = type;
     }
 
     @Override
     public void onSortingTypeChanged(int type) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), type, getSearchBoxMode(), getViewType()));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getViewType(), getSortingDirection(), type, getSearchBoxMode()));
 
         this.sortingType = type;
     }
 
     @Override
     public void onSortingDirectionChanged(int direction) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), direction, getSortingType(), getSearchBoxMode(), getViewType()));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getViewType(), direction, getSortingType(), getSearchBoxMode()));
 
         this.sortingDirection = direction;
     }
 
     @Override
     public void onSearchBoxModeChanged(int searchBoxMode) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), getSortingType(), searchBoxMode, getViewType()));
+        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getViewType(), getSortingDirection(), getSortingType(), searchBoxMode));
 
         this.searchBoxMode = searchBoxMode;
     }