For unknown reason (I didn't manage to find the culprit), the previous forward-port generate more queries than before.