Issue/1222

Fix network filter selection