Updated URL generation in case if no language was passed throught the URI