Refactor search factory
Removed unused parameters