fixed some filtering and types with sync