Broken - Adding menu filtering capabilities