Added filtering by category
Added searching