MIFOSX-750: earlier fix was incorrect and messed up paging results.