Added updates to .jbuilder files to remove N+1 queries