Nested List WIP, some fixes to filters