[FEATURE] Improve query performance of page-tree in workspaces

Change-Id: Ibaef07bdab87147c6826af8578870c52803dfe03