Updated FieldName and FieldValue validation