Fixing filtering issues.