[#530] Matching refactor from ckanext-dgu