move the match types to their own 'Enum', and update RequestHandler.
add a few more metres, from Bharavi
from Magha