move filter check to redirector