- [substance] Missing pagination and fixes on substance. Issue #79