Adding basic search functionality
Basic search functionality with backup
removed comments