APOLLO-3179 Added entity annotation back into group