fixed data query bug where join columns where not strict enough