Fixed bugs related to handling of special column names