Fix core #173: fetch only what's necessary

This requires association stuff in core