reorganise queries
reorganise queries