S3LocationSelectorWidget2 also doesn't play nicely in merge form