Refactoring notes to reduce duplicate code, use inflection where possible, support multiple included labels for improved grouping, display labels for identifiers only (DHH-469)