updated joins for change in condition parameter order