WIP: filter works for initial load only