Added search by category or title, and search by singer name