Some fixes related to Search Entry.