fix match key validator regex
add match key validation