improve tracks queryParams