extended  regex for Irish addresses and removed untainting