Search selector fixes