Match fields to front-end modal (#123)