Changed to use new CargoQueryDisplayer class