Improved constraints for quiz workflow