Copying column filter bug fixes from aws-release branch.

Change-Id: I51628f5130062ecf63af3adfbea27f3666d4733e