some more search enhancements (issue #233); some other fixes