Minor Refactoring
Minor tweaks to Search functionality