Update regular expressions to improve accuracy of organisation checking