added search by category and search by keyword