Industry Facilities UI - A simple request

I am finally getting into the industry side of EVE after many years playing and I’m very impressed with all the new features, but I’m having difficulties finding the right structures for the jobs I want to do. I have a very simple request to greatly improve the facilities tab in the Industry UI.

Exclude NPC Stations From Results

Exclude Structures That Do Not Have Upgrades

That’s all. Thank you for your attention to this matter.