TRAVEL-160: fixed bugs: fillAsPrevious and other