HHH-2736 switch to addQueryHint