Switching to URIs for matcher IDs as well