add general and query questions