Advance filter improvements

closes #8