fix $expands + paging