Fixing regex to accept decimal numbers and names with hyphen '-'