Added `endpoints-entityID' validation