Fixes for category filter