Bugfix/page search