Added search functionality
Minor tweaks