added validation rule bug fixes