Modified search to be more clean