Fix bug where public show_modal() and close_modal() didn't know which modal to target