Extend #1642 to include FeatureGroups and lookup by id.