improvement: more friendly toggling of search