fixes & changes to search