improved track querying