Minor tweaks and resolved minor issues with search