split querying in two to fix issues with conflicting joins causing duplicate results