Updated searcher to include category- and language search