Removed useless method
Fixed N + 1 and cleaned up search URL