Added filter by 'unique action' and quick test on solution for When vs When_JS issue