add param to include tablename in rawdata output optionally