Fixed pep errors
Removed search query that is not used anymore