Improved some variable naming
Text in the filter bar no longer shows a selection highlight