Fixes for temporary url modal issues