Added code to expand polling district shorthand