fix bug + introduce query.type (gauge, counter, ...) for future futures