Feature #2858: improve add AR modal