diff --git a/.gradle/2.6/taskArtifacts/cache.properties.lock b/.gradle/2.6/taskArtifacts/cache.properties.lock
index 35b712e..e55d926 100644
Binary files a/.gradle/2.6/taskArtifacts/cache.properties.lock and b/.gradle/2.6/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.6/taskArtifacts/fileHashes.bin b/.gradle/2.6/taskArtifacts/fileHashes.bin
index addc1aa..3b863d2 100644
Binary files a/.gradle/2.6/taskArtifacts/fileHashes.bin and b/.gradle/2.6/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.6/taskArtifacts/fileSnapshots.bin b/.gradle/2.6/taskArtifacts/fileSnapshots.bin
index 5f85321..9e931a7 100644
Binary files a/.gradle/2.6/taskArtifacts/fileSnapshots.bin and b/.gradle/2.6/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.6/taskArtifacts/outputFileStates.bin b/.gradle/2.6/taskArtifacts/outputFileStates.bin
index 01f7e56..e932662 100644
Binary files a/.gradle/2.6/taskArtifacts/outputFileStates.bin and b/.gradle/2.6/taskArtifacts/outputFileStates.bin differ
diff --git a/.gradle/2.6/taskArtifacts/taskArtifacts.bin b/.gradle/2.6/taskArtifacts/taskArtifacts.bin
index c3d63b9..d9e281e 100644
Binary files a/.gradle/2.6/taskArtifacts/taskArtifacts.bin and b/.gradle/2.6/taskArtifacts/taskArtifacts.bin differ
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/CommandMain.java b/src/main/java/com/karanumcoding/adamantineshield/commands/CommandMain.java
index a244a43..195be68 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/CommandMain.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/CommandMain.java
@@ -22,29 +22,29 @@ public class CommandMain implements CommandExecutor {
 	@Override
 	public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
 		boolean hasAnyPermission = false;
-		Text text = Text.of(TextColors.DARK_AQUA, "[AS] ", TextColors.YELLOW, "Available commands: ", Text.NEW_LINE);
+		Text text = Text.of(TextColors.DARK_AQUA, "[AS] ", TextColors.YELLOW, "Available commands: ");
 		if (src.hasPermission(Permissions.LOOKUP.get())) {
 			hasAnyPermission = true;
-			text = Text.of(text, CommandInspect.getHelpEntry(), Text.NEW_LINE, CommandLookup.getHelpEntry(), Text.NEW_LINE);
+			text = Text.of(text, Text.NEW_LINE, CommandInspect.getHelpEntry(), Text.NEW_LINE, CommandLookup.getHelpEntry());
 		}
 		if (src.hasPermission(Permissions.FILTER.get())) {
 			hasAnyPermission = true;
-			text = Text.of(text, CommandFilter.getHelpEntry(), Text.NEW_LINE);
+			text = Text.of(text, Text.NEW_LINE, CommandFilter.getHelpEntry());
 		}
 		if (src.hasPermission(Permissions.LOOKUP.get())) {
-			text = Text.of(text, CommandPage.getHelpEntry(), Text.NEW_LINE, CommandNextPage.getHelpEntry(), Text.NEW_LINE,
-					CommandPrevPage.getHelpEntry(), Text.NEW_LINE);
+			text = Text.of(text, Text.NEW_LINE, CommandPage.getHelpEntry(), Text.NEW_LINE, CommandNextPage.getHelpEntry(), Text.NEW_LINE,
+					CommandPrevPage.getHelpEntry());
 		}
 		if (src.hasPermission(Permissions.PURGE.get())) {
 			hasAnyPermission = true;
-			text = Text.of(text, CommandPurge.getHelpEntry(), Text.NEW_LINE);
+			text = Text.of(text, Text.NEW_LINE, CommandPurge.getHelpEntry());
 		}
 		
 		if (hasAnyPermission) {
-			text = Text.of(text, getHelpEntry(), Text.NEW_LINE);
+			text = Text.of(text, Text.NEW_LINE, getHelpEntry());
 		} else {
-			text = Text.of(TextColors.DARK_AQUA, "[AS] ", TextColors.YELLOW, "AdmantineShield v",
-					Sponge.getPluginManager().getPlugin("adamantineshield").get().getVersion(), " by Karanum");
+			text = Text.of(TextColors.DARK_AQUA, "[AS] ", TextColors.YELLOW, "AdamantineShield v",
+					Sponge.getPluginManager().getPlugin("adamantineshield").get().getVersion().get());
 		}
 		
 		src.sendMessage(text);
@@ -52,7 +52,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield help", TextColors.AQUA, " - Shows command help");
+		return Text.of(TextColors.AQUA, "/ashield help", TextColors.WHITE, " - Shows command help");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/CommandPurge.java b/src/main/java/com/karanumcoding/adamantineshield/commands/CommandPurge.java
index a7849af..3bf0b2c 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/CommandPurge.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/CommandPurge.java
@@ -51,7 +51,7 @@ public void doPurge(CommandSource src, long before) {
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield purge <time>", TextColors.AQUA, " - Purges old log entries");
+		return Text.of(TextColors.AQUA, "/ashield purge <time>", TextColors.WHITE, " - Purges old log entries");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/CommandReload.java b/src/main/java/com/karanumcoding/adamantineshield/commands/CommandReload.java
index 07a36a5..c8f79a8 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/CommandReload.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/CommandReload.java
@@ -17,7 +17,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield reload", TextColors.AQUA, " - Reloads this plugin");
+		return Text.of(TextColors.AQUA, "/ashield reload", TextColors.WHITE, " - Reloads this plugin");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandFilter.java b/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandFilter.java
index 7235664..9352067 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandFilter.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandFilter.java
@@ -43,7 +43,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 		
 		FilterSet filterSet = new FilterSet(plugin, p, false);
 		filterSet.forceLookupType(lookup.getLookupType());
-		FilterParser.parse(filters, filterSet);
+		FilterParser.parse(filters, filterSet, p);
 		lookup.filterResult(filterSet);
 		
 		lookup.showPage(p, 1);
@@ -51,7 +51,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield filter [filters]", TextColors.AQUA, " - Filters your last result");
+		return Text.of(TextColors.AQUA, "/ashield filter [filters]", TextColors.WHITE, " - Filters your last result");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandInspect.java b/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandInspect.java
index 97ae8e3..880f248 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandInspect.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandInspect.java
@@ -37,7 +37,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield inspect", TextColors.AQUA, " - Toggles the inspector");
+		return Text.of(TextColors.AQUA, "/ashield inspect", TextColors.WHITE, " - Toggles the inspector");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandLookup.java b/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandLookup.java
index 826d7f6..821151c 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandLookup.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/lookup/CommandLookup.java
@@ -44,7 +44,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 		Collection<String> filters = args.getAll("filter");
 		
 		FilterSet filterSet = new FilterSet(plugin, p, true);
-		FilterParser.parse(filters, filterSet);
+		FilterParser.parse(filters, filterSet, p);
 		String targetTable = filterSet.getLookupType().getTable();
 		
 		Sponge.getScheduler().createAsyncExecutor(plugin).execute(() -> {
@@ -81,7 +81,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield lookup [filters]", TextColors.AQUA, " - Performs a lookup");
+		return Text.of(TextColors.AQUA, "/ashield lookup [filters]", TextColors.WHITE, " - Performs a lookup");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandNextPage.java b/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandNextPage.java
index 4e6ea88..3c1a25f 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandNextPage.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandNextPage.java
@@ -38,7 +38,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield nextpage", TextColors.AQUA, " - Switches to next result page");
+		return Text.of(TextColors.AQUA, "/ashield nextpage", TextColors.WHITE, " - Switches to next result page");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPage.java b/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPage.java
index 3a5b937..a88ae8b 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPage.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPage.java
@@ -38,7 +38,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield page <page>", TextColors.AQUA, " - Switches lookup result page");
+		return Text.of(TextColors.AQUA, "/ashield page <page>", TextColors.WHITE, " - Switches lookup result page");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPrevPage.java b/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPrevPage.java
index 17cffef..c798756 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPrevPage.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/pages/CommandPrevPage.java
@@ -38,7 +38,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield prevpage", TextColors.AQUA, " - Switches to previous result page");
+		return Text.of(TextColors.AQUA, "/ashield prevpage", TextColors.WHITE, " - Switches to previous result page");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandRollback.java b/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandRollback.java
index a0f6e68..45c1852 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandRollback.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandRollback.java
@@ -17,7 +17,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield rollback [filters]", TextColors.AQUA, " - Performs a rollback");
+		return Text.of(TextColors.AQUA, "/ashield rollback [filters]", TextColors.WHITE, " - Performs a rollback");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandUndo.java b/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandUndo.java
index fde9715..a1c1e6a 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandUndo.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/commands/rollback/CommandUndo.java
@@ -17,7 +17,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 	}
 	
 	public static Text getHelpEntry() {
-		return Text.of(TextColors.YELLOW, "/ashield undo [filters]", TextColors.AQUA, " - Undoes rollback results");
+		return Text.of(TextColors.AQUA, "/ashield undo [filters]", TextColors.WHITE, " - Undoes rollback results");
 	}
 
 }
diff --git a/src/main/java/com/karanumcoding/adamantineshield/util/FilterParser.java b/src/main/java/com/karanumcoding/adamantineshield/util/FilterParser.java
index 1bf6c69..64444d2 100644
--- a/src/main/java/com/karanumcoding/adamantineshield/util/FilterParser.java
+++ b/src/main/java/com/karanumcoding/adamantineshield/util/FilterParser.java
@@ -8,6 +8,7 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.block.BlockType;
 import org.spongepowered.api.command.CommandException;
+import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.item.ItemType;
 import org.spongepowered.api.profile.GameProfile;
 import org.spongepowered.api.text.Text;
@@ -34,7 +35,7 @@ public static void setConfig(ConfigHandler config) {
 		FilterParser.config = config;
 	}
 	
-	public static void parse(Collection<String> filters, FilterSet container) throws CommandException {
+	public static void parse(Collection<String> filters, FilterSet container, Player p) throws CommandException {
 		if (container == null || filters.isEmpty())
 			return;
 		
@@ -98,7 +99,7 @@ public static void parse(Collection<String> filters, FilterSet container) throws
 						}
 						if (radius < 0 || radius > config.getInt("lookup", "max-radius"))
 							throw new CommandException(Text.of(TextColors.RED, "Radius is either negative or too large!"));
-						((PositionFilter) container.getFilter(PositionFilter.class).get()).setRadius(radius);
+						container.getOrCreate(new PositionFilter(p.getLocation().getBlockPosition(), 0)).setRadius(radius);
 						break;
 				}
 			}