Merge network filtering updates and improvments