Separated FilterRestriction and AccountFilter and fixed #59