Search dialog overhauled