Fixes #74, should filter types and other fields (will require rtti fix)