Tweeked locationn of filtering.  Less confusing now :D