Add category and tag search. Search api components are now separate classes/files.