Added ability to exclude questions based on State