Do not replace state to search if no search is made
Minor tweaks