Adjusting unless logic to not skip cases where Column is in the name.