[DF-2857] Fixes for tank parsing