Add order by isPrimary