fix for multiple filter_with declarations
Merge branch '0-9' of github.com:citrininfo/netzke-basepack into 0-9