Changed filter behavior in network
Fixed some bugs