Fix: entity into public pages not set at correct place