Code clean up and relax server side filter's restriction on being in server mode