queryHelpers.position query fix for missing endDate v2