Fix up Source relationship and Tag child relationship/matching.