FullYear: moved query into dataFunctions