Fix deep category search & store