added handling difference between Topic and Location
handle diff between topic and location