search_attributes improvements