Better handling of spaces in door IDs