Update filter logic to fix capture collection filtering

Update filter logic to fix capture collection filtering #810