Updated regex to minimize false matches