Fix for when filtering is disabled on the client.
Merge pull request #1 from dbartram/fix-filter-disable

Fix for when filtering is disabled on the client.