Added forwarding and fromfor filter