Site Management - Need help to create dynamic Filters based on Site

First off, our AD Site to subnet assignment is unusable, too messy.

I created Sites and Subnets manually, assigning subnets to sites.  Now I am stump on how to create Filters based on the Sites I created, so that It would display desktops and servers or is there a better way of doing this?

Thanks