changed queries to v1.6 format