master
Filter entries in the collection per EntryFilter#filter
Homagah it all renders I think.
Resolve second conflict