Bug fix: correctly handle column name which is a substring of another

longer column name