further fixes for entity-specific caps