Finalised match units service, need to test geographic data and exhaust selected queries.