BZ-993045: general improvements on search