Issue 3 solved. Temporary Hack - Added both WikiData and WikiTopic.