style fixes, minor search tweak