Search entry

Better search entry behaviour.