Issue by smithworx: query correction for source and target counts