Move search_xxx to xxx_with :selector => ...