TMDM-7434: final fix on reverting column/charts switching