Fixing bugs in new Entity detail views, to handle cases where data does not exist