Get rid of "double select" bug by wrapping all association queries in using() blocks