fine-tune positinslist; fix orderby broken by passing $rows
Merge commit 'github/testing' into beta