Work on change labels from advanced search
Merge branch 'c4c.staging.change_labels_from_advanced_search' into c4c.staging