Added better support for associating an alert with a device location.