Fixes issue with search page from PR 713
Merge pull request #717 from cdloh/dev

Fixes issue with search page from PR 713
Merge pull request #718 from echel0n/dev

Dev