Fixed Edit search. Formatted and fix imports for files.