Filter actions not overridden by cluster fill

Fixes #459 and #458