implemented more scenarios for search feature