#21 add before filters