Improve URI matching in AnnotatedRestService