Merge pull request #571 from metamx/filtered-serverview

FiltereServerView