Improve filtering
Improve category model