switch to using annotationId parameter instead of as a direct part of
the URL
add safety checks to avoid creating a uri from a null string
fix more tests
catch illegalargumentexception from value factory when attempting to
create a URI