include user-type in the matches at top-level