[Optimize/Secure] Better filtering @theserapher recommended