bug fix
bug fix
fix logic of GetUnderlyingColumns
configurable suffix setting