WIP: moving between filters and handling datasource changes