Closes #343 - added allowed values for enum fields in queryTemplate