Fix again pagination problem with listing tables