cleaned up search override