#506 Update page fetching