Js cleaning + search bugfix