diff --git a/src/components/SearchAutocomplete/index.js b/src/components/SearchAutocomplete/index.js
index 742c4e175..1392cf8b1 100644
--- a/src/components/SearchAutocomplete/index.js
+++ b/src/components/SearchAutocomplete/index.js
@@ -51,13 +51,13 @@ class SearchAutocomplete extends Component {
       const chapterId = captures[1];
       const ayahNum = captures[2];
       const chapter = this.props.chapters[chapterId];
-      matches.push([chapter.name.simple, chapter.chapterNumber + (ayahNum ? `/${ayahNum}` : '')]);
+      matches.push([chapter.nameSimple, chapter.chapterNumber + (ayahNum ? `/${ayahNum}` : '')]);
     } else if (value.length >= 2) {
       const escaped = value.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&');
 
       Object.keys(this.props.chapters).forEach((chapterId) => {
         const chapter = this.props.chapters[chapterId];
-        if (RegExp(escaped, 'i').test(chapter.name.simple.replace(/['-]/g, ''))) {
+        if (RegExp(escaped, 'i').test(chapter.nameSimple.replace(/['-]/g, ''))) {
           matches.push([chapter.nameSimple, chapter.chapterNumber]);
         } else if (RegExp(escaped, 'i').test(chapter.nameArabic)) {
           matches.push([chapter.nameArabic, chapter.chapterNumber]);
@@ -154,7 +154,7 @@ class SearchAutocomplete extends Component {
         onKeyDown={event => this.handleItemKeyDown(event, item)}
       >
         <div className={styles.link}>
-          <a href={item.href} tabIndex="-1">{item.href}</a>
+          <a href={item.href} tabIndex="-1">{item.ayah}</a>
         </div>
         <div className={styles.text}>
           <a href={item.href} tabIndex="-1" dangerouslySetInnerHTML={{ __html: item.text }} />
diff --git a/src/components/Verse/index.js b/src/components/Verse/index.js
index d68af8483..91fcc66e4 100644
--- a/src/components/Verse/index.js
+++ b/src/components/Verse/index.js
@@ -26,19 +26,21 @@ const Share = Loadable({
 class Verse extends Component {
   // TODO: Should this belong here?
   componentDidMount() {
-    const { verse, audio } = this.props;
-
-    this.props.loadAudio({
-      chapterId: verse.chapterId,
-      verseId: verse.id,
-      verseKey: verse.verseKey,
-      audio
-    });
+    const { verse, audio, isSearched } = this.props;
+
+    if (!isSearched) {
+      this.props.loadAudio({
+        chapterId: verse.chapterId,
+        verseId: verse.id,
+        verseKey: verse.verseKey,
+        audio
+      });
+    }
   }
 
   // TODO: Should this belong here?
   componentWillReceiveProps(nextProps) {
-    if (this.props.audio !== nextProps.audio) {
+    if (!this.props.isSearched && this.props.audio !== nextProps.audio) {
       const { verse, audio } = nextProps;
 
       this.props.loadAudio({
diff --git a/src/redux/actions/suggest.js b/src/redux/actions/suggest.js
index a16118deb..250a551a7 100644
--- a/src/redux/actions/suggest.js
+++ b/src/redux/actions/suggest.js
@@ -7,7 +7,7 @@ import {
 export function suggest(query, lang = 'en') {
   return {
     types: [SUGGEST, SUGGEST_SUCCESS, SUGGEST_FAIL],
-    promise: client => client.get('/v2/suggest', { params: { q: query, l: lang } }),
+    promise: client => client.get('/api/v3/suggest', { params: { q: query, l: lang } }),
     query
   };
 }