Updated survey model for expanded query support