refactor CategorySearch