Form URI bug fix