Finished the regex

It now matches both customer id and customer name when both are provided