Simplified querying of page_props table

Change-Id: Id332a2bf1ceb3d05c84d64e845e1f67d7ad7092a