Implemented search. Fixed Support Issues