I am afraid I don't understand.
Even if the source data structure is not capable of providing all information (which sounds doubtful), you could copy the data into a structure that does, just like you are doing now.
Not sure what you mean, each type's filter model will be a separate signal source.
Don't you already know the type of an entry? How would you otherwise even filter for a type?
Cheers,
_
Bookmarks