enhance: change match query to map string to string

[cla-checker-service[bot]]

❌ Author of the following commits did not sign a Contributor Agreement: 25c0017ce213df3685f1c8c4bf2e00e000ea228f

Please, read and sign the above mentioned agreement if you want to contribute to this project