Fixed issue when using filter within action and vice versa