Changes for URL-s without hash