* Search fix
* Editor fix