Split search into three methods, added helpers for getting authors and subjects
Fixed merge conflicts