also don't eager load function fields; this speeds things up dramatically
bumped 1.9 version