Fix done count
Pass filter through to module state change