Include query index when changing a query
Implement handleAddLanguage