improved performance handling csv columns

Change-Id: I11de7f424139005941b5c2d08935e6d8f8a23d8c