Updated script to limit duplicate matches

Removed cross-join which resulted in duplicate rows and tightened up query.