Fix for associated resources needing queries to instantiate