diff --git a/src/App.js b/src/App.js
index 596748b..6d45d2f 100755
--- a/src/App.js
+++ b/src/App.js
@@ -37,6 +37,10 @@ class BooksApp extends React.Component {
         books: [...this.state.books, newBook]
       });
     });
+    const newBooks = this.state.books
+    newBooks.forEach((book) => {
+      update(book, book.shelf)
+    })
   }
 
   onSelectChange = (e) => {
diff --git a/src/SearchPage.js b/src/SearchPage.js
index 7065ab0..724d39a 100644
--- a/src/SearchPage.js
+++ b/src/SearchPage.js
@@ -37,12 +37,12 @@ class SearchPage extends Component {
         </div>
         <div className="search-books-results">
           <ol className="books-grid">
-          {
-            this.state.results.map((result) => {
-              return <li key={result.id}>
-                        <div className="book">
-                            <div className="book-top">
-                                <div className="book-cover" style={{ width: 128, height: 193, backgroundImage: `url("${ result.imageLinks.thumbnail }")` }}></div>
+          { this.state.results.length > 0 && (
+              this.state.results.map((result) => {
+                return <li key={result.id}>
+                          <div className="book">
+                              <div className="book-top">
+                                  <div className="book-cover" style={{ width: 128, height: 193, backgroundImage: `url("${ result.imageLinks.thumbnail }")` }}></div>
                                       <div className="book-shelf-changer">
                                         <select name={result.id} onChange={onSelect}>
                                           <option value="none">Move to...</option>
@@ -57,7 +57,8 @@ class SearchPage extends Component {
                             <div className="book-authors">{result.authors}</div>
                           </div>
                         </li>
-            })
+                  })
+              )
           }
           </ol>
         </div>