Atom: Search tweaks