Updated queries and languages