Fixed search
Refactored js imports