fixed a bug with search

Also removed overqualified selectors