Handle entities with no columns #222