Add /category and /search functionality, with tests