[complete #72405000] Add search by category functionality
Merge branch 'feature/72405000' into develop