fix hex matcher to match uppercase
add uuid matcher