Improve category searching