Separate query languages from query generation

See merge request !14 (merged).