lots of tweaks and cleanups to search behavior, should be back like it used to be