Add test to make sure where queries with only some points having the matching column work
Fix merge conflict.