Merge "Use an integer for query mode" into main