- Finish up key filtering upgrade for invalid keys