fixed broken search, refactored search form, added search to category as well