Can you share a few sample records and a query that show cases the problem? We can then use that to investigate the issue.