diff --git a/src/VideoInfo.js b/src/VideoInfo.js
index 4fcc0fb..072d1ea 100644
--- a/src/VideoInfo.js
+++ b/src/VideoInfo.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Wikipedia from './Wikipedia';
 import { Card, Tabs, Tab } from 'react-bootstrap';
-import {Link} from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import axios from 'axios';
 import Linkify from "react-linkify";
 import moment from 'moment';
@@ -67,12 +67,12 @@ class VideoInfo extends React.Component {
     }
 
     // componentDidUpdate(prevProps, prevState, snapshot) {
-    
+
     // }
 
     // shouldComponentUpdate(nextProps, nextState) {
     // }
-    
+
     render() {
         const { error, isLoaded, VideoDetails, comments } = this.state;
         const momentDuration = this.momentDuration;
@@ -80,7 +80,7 @@ class VideoInfo extends React.Component {
         if (error) {
             return (
                 <span className="text-white">
-                <span>{}</span>
+                    <span>{}</span>
                     Error: {error.message} -- Cannot get {error.config.url}
                 </span>
             );
@@ -98,8 +98,8 @@ class VideoInfo extends React.Component {
                                 <b>Channel name: </b>{VideoDetails.snippet.channelTitle}<br />
                                 <b>Description: </b><Linkify>{VideoDetails.snippet.description}</Linkify><br />
                                 <b>Tags: </b>{VideoDetails.snippet.tags ?
-                                    VideoDetails.snippet.tags.map((tag,i) => 
-                                    ( <span key={i}><Link to={{pathname: '/search/' + tag}}>{tag}</Link>{" "}</span> )) 
+                                    VideoDetails.snippet.tags.map((tag, i) =>
+                                        (<span key={i}><Link to={{ pathname: '/search/' + tag }}>{tag}</Link>{" "}</span>))
                                     : ""}
                             </p>
                         </Tab>
@@ -136,13 +136,13 @@ class VideoInfo extends React.Component {
                             {/* Insert code here */}
                         </Tab>
                         <Tab className="text-white" eventKey="wikipedia" title="Wikipedia">
-                            <Wikipedia 
-                            title={this.props.location.state.title}
-                            title2={ytclear(this.state.VideoDetails.snippet.title).split('-')[1]}
-                            artist={this.props.location.state.artist}
-                            artist2={ytclear(this.state.VideoDetails.snippet.title).split('-')[0]}
-                            key={this.props.videoId}
-                            videoId={this.props.videoId}
+                            <Wikipedia
+                                title={'undefined' !== typeof this.props.location.state ? this.props.location.state.title : undefined}
+                                title2={ytclear(this.state.VideoDetails.snippet.title).split('-')[1]}
+                                artist={'undefined' !== typeof this.props.location.state ? this.props.location.state.artist : undefined}
+                                artist2={ytclear(this.state.VideoDetails.snippet.title).split('-')[0]}
+                                key={this.props.videoId}
+                                videoId={this.props.videoId}
                             />
                         </Tab>
                     </Tabs>
diff --git a/src/Wikipedia.js b/src/Wikipedia.js
index 76388a1..86dd993 100644
--- a/src/Wikipedia.js
+++ b/src/Wikipedia.js
@@ -40,6 +40,9 @@ class Wikipedia extends Component {
 					wikidatakeys: Object.keys(wikidatatmp.claims),
 					isWDataLoaded: true
 				});
+				wdk.getManyEntities(Object.keys(wikidatatmp.claims), 'en').then(
+					res=> console.info(res,'eee')
+				)
 				if (wikidatatmp.sitelinks.enwiki)
 					wikijs()
 						.page(wikidatatmp.sitelinks.enwiki.title)