Revert "Revert "Removed list from search method""

This reverts commit 427f995ce0af54009388196b24e5d86533f69d94.