Further amendments to search api facade