AddSelectedToQueryItem refactoring