Just to be a douchebag can we update these queries to use JDatabaseQuery whilst we're at it? Or would you rather that in a separate PR?