Rework org for position query.