more favicon fixes and some uri handling cleanup