Fixing errors with filtering and links