refactor load method
rename method
export LoadFromQuery