refactor network policy, this also (maybe) fix problem with signal dissappear after choosing option