swap _uri and uri. Partly fixing issue #3