This is the final piece that is needed to complete the current issues with page search quote.
I'm going to reference both issues because this and the previous commits were required to fix them.

Fixes #1095
Fixes #1103