qualification search improvements, RT#7111