Fix sub requests #1339

As with all modals, we should have this in another file