Merge "Fix up label in QS detail" into nyc-dev