Fixed so Time & DateTime aren't cut off in short and long hash formats