Search implementation
Integrating changes