Revert "Fix Author and Search Page"

This reverts commit c4dc2aee977f9dc6aa788e46d6171ed5ab9d7d67.
Revert "Revert "Fix Author and Search Page""

This reverts commit 195ac3c50a83564462654ea402581051e26a2dd9.