diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java b/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java
index 7157574f9..124ff9610 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java
@@ -6,9 +6,7 @@ import net.minecraftforge.fml.client.registry.ClientRegistry;
 import org.lwjgl.input.Keyboard;
 
 public final class RSKeyBindings {
-    private static final String categoryName = RS.ID;
-
-    public static final KeyBinding focusSearchBar = new KeyBinding("key.rs.focusSearchBar", KeyConflictContext.GUI, Keyboard.KEY_TAB, categoryName);
+    public static final KeyBinding focusSearchBar = new KeyBinding("key.refinedstorage.focusSearchBar", KeyConflictContext.GUI, Keyboard.KEY_TAB, "Refined Storage");
 
     public static void init() {
         ClientRegistry.registerKeyBinding(focusSearchBar);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
index 89d8271a3..dd07f4f19 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
@@ -26,6 +26,8 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
 
+import javax.annotation.Nullable;
+
 public abstract class BlockBase extends Block {
     private final String name;
 
@@ -189,6 +191,7 @@ public abstract class BlockBase extends Block {
         return super.canEntityDestroy(state, world, pos, entity);
     }
 
+    @Nullable
     public Direction getDirection() {
         return Direction.HORIZONTAL;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
index 9decf7e85..1c0c65dd3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
@@ -21,6 +21,7 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -226,6 +227,7 @@ public class BlockCable extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java
index 753dfd297..2035bbb29 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java
@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -92,6 +93,7 @@ public class BlockConstructor extends BlockCable {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java
index 1a1f57817..e4fac81f7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java
@@ -10,6 +10,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
+
 public class BlockCrafter extends BlockNode {
     public BlockCrafter() {
         super("crafter");
@@ -30,6 +32,7 @@ public class BlockCrafter extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY_FACE_PLAYER;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java
index 27e50ea0f..d10aad164 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java
@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class BlockDestructor extends BlockCable {
@@ -48,6 +49,7 @@ public class BlockDestructor extends BlockCable {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
index c000c6e0f..d10459afa 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
@@ -15,6 +15,8 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
+
 public class BlockDetector extends BlockNode {
     private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 5D / 16D, 1.0D);
 
@@ -87,6 +89,7 @@ public class BlockDetector extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java
index 90177ae22..d855653be 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java
@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -98,6 +99,7 @@ public class BlockExporter extends BlockCable {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java
index c1e61c20a..8b96967ec 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java
@@ -14,6 +14,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -96,6 +97,7 @@ public class BlockExternalStorage extends BlockCable {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java
index bcc369885..0889c1560 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java
@@ -11,6 +11,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
+
 public class BlockFluidInterface extends BlockNode {
     public BlockFluidInterface() {
         super("fluid_interface");
@@ -36,6 +38,7 @@ public class BlockFluidInterface extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
index f5382f947..8b5c20b15 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
@@ -22,6 +22,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -112,6 +113,7 @@ public class BlockFluidStorage extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java
index 512811df7..26965bd74 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java
@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -98,6 +99,7 @@ public class BlockImporter extends BlockCable {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java
index fbc344d05..b1f692dd5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java
@@ -11,6 +11,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
+
 public class BlockInterface extends BlockNode {
     public BlockInterface() {
         super("interface");
@@ -36,6 +38,7 @@ public class BlockInterface extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java
index bee74e449..206bd0306 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java
@@ -1,11 +1,14 @@
 package com.raoulvdberge.refinedstorage.block;
 
+import javax.annotation.Nullable;
+
 public class BlockMachineCasing extends BlockBase {
     public BlockMachineCasing() {
         super("machine_casing");
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java
index 22131fe71..4a4afa215 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java
@@ -5,6 +5,8 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
+
 public class BlockNetworkReceiver extends BlockNode {
     public BlockNetworkReceiver() {
         super("network_receiver");
@@ -16,6 +18,7 @@ public class BlockNetworkReceiver extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java
index 6d15e09fe..0faeabe43 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java
@@ -10,6 +10,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
+
 public class BlockNetworkTransmitter extends BlockNode {
     public BlockNetworkTransmitter() {
         super("network_transmitter");
@@ -30,6 +32,7 @@ public class BlockNetworkTransmitter extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java
index 301cac8d4..71fd3be85 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java
@@ -14,6 +14,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class BlockProcessingPatternEncoder extends BlockBase {
@@ -49,6 +50,7 @@ public class BlockProcessingPatternEncoder extends BlockBase {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java
index 6f227180e..b75a60fc2 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java
@@ -1,11 +1,14 @@
 package com.raoulvdberge.refinedstorage.block;
 
+import javax.annotation.Nullable;
+
 public class BlockQuartzEnrichedIron extends BlockBase {
     public BlockQuartzEnrichedIron() {
         super("quartz_enriched_iron_block");
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java
index e71801b52..3a8268faa 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java
@@ -15,6 +15,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class BlockReader extends BlockCable {
@@ -70,6 +71,7 @@ public class BlockReader extends BlockCable {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY_FACE_PLAYER;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java
index 5a28b9b1c..562d2cb85 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java
@@ -10,6 +10,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
+
 public class BlockRelay extends BlockNode {
     public BlockRelay() {
         super("relay");
@@ -30,6 +32,7 @@ public class BlockRelay extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
index 8f6edbad8..8f07a7d46 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
@@ -22,6 +22,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -112,6 +113,7 @@ public class BlockStorage extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
index 9d76f7218..7e8778200 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
@@ -17,6 +17,7 @@ import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class BlockWirelessTransmitter extends BlockNode {
@@ -85,6 +86,7 @@ public class BlockWirelessTransmitter extends BlockNode {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java
index b0e6bbf09..110d7f914 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java
@@ -16,6 +16,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class BlockWriter extends BlockCable {
@@ -91,6 +92,7 @@ public class BlockWriter extends BlockCable {
     }
 
     @Override
+    @Nullable
     public Direction getDirection() {
         return Direction.ANY_FACE_PLAYER;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
index 48c948d8c..1dfac23e9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -73,16 +73,16 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
     private int slotNumber;
 
     private Deque<Integer> konami = new ArrayDeque<>(Arrays.asList(
-            Keyboard.KEY_UP,
-            Keyboard.KEY_UP,
-            Keyboard.KEY_DOWN,
-            Keyboard.KEY_DOWN,
-            Keyboard.KEY_LEFT,
-            Keyboard.KEY_RIGHT,
-            Keyboard.KEY_LEFT,
-            Keyboard.KEY_RIGHT,
-            Keyboard.KEY_B,
-            Keyboard.KEY_A
+        Keyboard.KEY_UP,
+        Keyboard.KEY_UP,
+        Keyboard.KEY_DOWN,
+        Keyboard.KEY_DOWN,
+        Keyboard.KEY_LEFT,
+        Keyboard.KEY_RIGHT,
+        Keyboard.KEY_LEFT,
+        Keyboard.KEY_RIGHT,
+        Keyboard.KEY_B,
+        Keyboard.KEY_A
     ));
 
     private int[] konamiOffsetsX;
@@ -170,9 +170,9 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
             stacks.addAll(grid.getType() == GridType.FLUID ? FLUIDS.values() : ITEMS.values());
 
             List<Predicate<IGridStack>> filters = GridFilterParser.getFilters(
-                    grid,
-                    searchField.getText(),
-                    (grid.getTabSelected() >= 0 && grid.getTabSelected() < grid.getTabs().size()) ? grid.getTabs().get(grid.getTabSelected()).getFilters() : grid.getFilters()
+                grid,
+                searchField.getText(),
+                (grid.getTabSelected() >= 0 && grid.getTabSelected() < grid.getTabs().size()) ? grid.getTabs().get(grid.getTabSelected()).getFilters() : grid.getFilters()
             );
 
             Iterator<IGridStack> t = stacks.iterator();
diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang
index f75594356..cfe904155 100755
--- a/src/main/resources/assets/refinedstorage/lang/en_US.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang
@@ -1,5 +1,7 @@
 itemGroup.refinedstorage=Refined Storage
 
+key.refinedstorage.focusSearchBar=Grid Search Bar Focus
+
 gui.refinedstorage:controller.0=Controller
 gui.refinedstorage:controller.1=Creative Controller
 gui.refinedstorage:grid=Grid