Fixed a bug with user added data metadata; Fixed bug with URIs as values