Fix restoring category filter state and enable subcategory inclusion by default