extended filters, fixed some serialization issues