diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
index 33a06911..c12a89c7 100644
--- a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
+++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
@@ -107,9 +107,10 @@ void ComicVineDialog::goNext()
 			{
 				showLoading();
 				comicVineClient->search(volumeSearchString);
+				status = AutoSearching;
 			}
 
-			status = Volume;
+			mode = Volume;
 		}
 		else
 		{
@@ -119,8 +120,8 @@ void ComicVineDialog::goNext()
 			showLoading();
 
 			comicVineClient->search(title);
-
-			status = SingleComicInSeries;
+			status = AutoSearching;
+			mode = SingleComicInList;
 		}
 	}
 	else if (content->currentWidget() == searchSingleComic) {
@@ -147,8 +148,8 @@ void ComicVineDialog::show()
 		showLoading();
 
 		comicVineClient->search(title);
-
-		status = SingleComic;
+		status = AutoSearching;
+		mode = SingleComic;
 	}else if(comics.length()>1)
 	{
 		titleHeader->setSubTitle(tr("%1 comics selected").arg(comics.length()));
@@ -177,29 +178,32 @@ void ComicVineDialog::debugClientResults(const QString & string)
 {
 	ResponseParser p;
 	p.loadJSONResponse(string);
-
-	QString debug = QString("%1 \n %2").arg(p.getNumResults()).arg(string);
-
-	QMessageBox::information(0,"-Response-", debug);
-
-	switch(status)
+	QMessageBox::information(0,"Result", QString("Number of results : %1").arg(p.getNumResults()));
+	if(p.responseError())
+		QMessageBox::critical(0,"Error from ComicVine", "-");
+	else
 	{
-	case SingleComic:
-		showSearchSingleComic();
-		break;
-	case Volume:
-		showSearchVolume();
-		break;
-	case SingleComicInSeries:
-		showSearchSingleComic();
-		break;
+		switch(mode)
+		{
+		case SingleComic: case SingleComicInList:
+			if(p.getNumResults() == 0)
+				showSearchSingleComic();
+			else
+				showSelectComic();
+			break;
+		case Volume:
+			if(p.getNumResults() == 0)
+				showSearchVolume();
+			else
+				showSelectVolume();
+			break;
+		}
 	}
-
-
 }
 
 void ComicVineDialog::showSeriesQuestion()
 {
+	status = AskingForInfo;
 	content->setCurrentWidget(seriesQuestion);
 	backButton->setHidden(true);
 	skipButton->setHidden(true);
@@ -210,6 +214,7 @@ void ComicVineDialog::showSeriesQuestion()
 
 void ComicVineDialog::showSearchSingleComic()
 {
+	status = AskingForInfo;
 	content->setCurrentWidget(searchSingleComic);
 	backButton->setHidden(true);
 	skipButton->setHidden(true);
@@ -220,13 +225,14 @@ void ComicVineDialog::showSearchSingleComic()
 
 void ComicVineDialog::showSearchVolume()
 {
+	status = AskingForInfo;
 	content->setCurrentWidget(searchVolume);
 	backButton->setHidden(true);
 	nextButton->setHidden(true);
 	searchButton->setVisible(true);
 	closeButton->setVisible(true);
 
-	if (status == SingleComicInSeries)
+	if (mode == SingleComicInList)
 		skipButton->setVisible(true);
 	else
 		skipButton->setHidden(true);
@@ -237,6 +243,11 @@ void ComicVineDialog::showSelectVolume()
 	content->setCurrentWidget(selectVolume);
 }
 
+void ComicVineDialog::showSelectComic()
+{
+
+}
+
 void ComicVineDialog::showLoading()
 {
 	content->setCurrentIndex(0);
@@ -249,7 +260,7 @@ void ComicVineDialog::showLoading()
 
 void ComicVineDialog::search()
 {
-	switch (status) {
+	switch (mode) {
 	case Volume:
 		launchSearchVolume();
 		break;
diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.h b/YACReaderLibrary/comic_vine/comic_vine_dialog.h
index d4b023a9..eceb6970 100644
--- a/YACReaderLibrary/comic_vine/comic_vine_dialog.h
+++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.h
@@ -44,17 +44,25 @@ protected slots:
 	void launchSearchVolume();
 	void launchSearchComic();
 	void showSelectVolume();
+	void showSelectComic();
 private:
 
+	enum ScrapperMode
+	{
+		SingleComic,       //the scrapper has been opened for a single comic
+		Volume,            //the scrapper is trying to get comics info for a whole volume
+		SingleComicInList  //the scrapper has been opened for a list of unrelated comics
+	};
+
 	enum ScrapperStatus
 	{
-		SingleComic,
-		Volume,
-		SingleComicInSeries,
+		AutoSearching,
+		AskingForInfo,
 		SelectingComic,
 		SelectingSeries
 	};
 
+	ScrapperMode mode;
 	ScrapperStatus status;
 
 	ComicVineClient * comicVineClient;