Remove not needed search option
Fix bug