Fix pull request changes for search implementation commit
fix pull request changes for search/listing interface