Restructure page fetch mechanism
Improve related page retrieval