update: Better handling of Knowledge Graph

* Added more logic to handle Knowledge Graph results