TBD-562: fix different issues with parquet and hive