References #2429. Fixing issue related to exporting tables for two different cases (sessions and tables)

Change-Id: Iff56e207dbef5f7e679625ac76eefe43c740aa17