Move SecurityFilter back to DDB-Next