a little bit of refactor - trying now to convert every uri instead of just from the haystack
minor renames