Fixed paged rowexpanders: retrieve correct index from store. Fixes #192
Merge from master