update with filter and route - WIP