Better handling of current search state.