Update MCP to use new filter switches. Fixes #4