Improved QueryProcessor and DatasetParser and HotelIndexer