For #31 - implemented filtering in data service
For #31 - fixes minor UI glitches