Uses flatMap instead of blocking for the page request
Some cleanups