rework for only-one-entry-for-public