Category Search
Category - merge fixes