Fix: only handle intercepts that contain a model + add menu controller