make location matching more strict
Before, if "upstairs: keypad" and "downstairs: keypad" were both devices, and then "downstairs: keypad" was removed, then "downstairs: keypad" would start matching "upstairs: keypad".  That would lead to some confusing situations!