Added simple search functionality to gateway