Major changes to teh filtering system.

Allowing people to select either node or circle view.