Search control fixes