Sorry for the delay @Imperial_Squid , I'll get that upgrade branch merged. You can make your branch off of the upgrade branch.
The filter changes sound good to me