Editorisl updates to both HotelTagReader and Writer