Search functionality

Ajinkya, review and pull