More places are now using GET_TOTAL_DATA() instead of query