More dev on search integration, still not working fully