Misc. improvements
Improvement to client-side filter script