Revert "Categories ids moved to filters"

This reverts commit 3f8380f2b8b8fcfd161b804c2a5b58bf4155e952.