Improving map toasts, #155