Change api to search in 4.2 api

This should instead of #23.

I don't know what was the purpose of the or in line 49, because I'm pretty sure it always returned true.