Using querybuilder all over the place
Minor fixes to resource accessors