I admire your dedication to getting the highest numbers possible :D
About the Upgrade type filter: yeah, so far there are no other types, adding the 4 extra upgrades you've mentioned makes sense. I'll think of more upgrade types in the future, maybe I'll come up with something fitting in the next major update already.
Let me know if you encounter any more issues, typos or anything else :)
Be sure to take a break every now and then!
And as always, have fun and stay healthy! :)