entry uniqueness validation rewritten