Added more error handling and implemented keyword display for search