Fixed premature field error when multiple conditions exist in validation REGEX

Packed new update with latest changes
Merge branch 'updates'