Squashed merge of date fixes for temporary url modal