Hooks cleanup WIP
Hooks cleanup WIP

fetch is called multiple times per query.
Need to fix this.

jeffslofish/open-source-help-wanted,jeffslofish/open-source-help-wanted,jeffslofish/open-source-help-wanted