VE-1178 Use correct tracker for GA/DW data