Added some partial updates to the Filter control. I think I'm abandoning that method