Set normalize uri on modules

This is a follow on from PULL 1045 (HDM)

I've implemented the normalize_uri() function on a number
of modules that I think HD overlooked... there are probably
more that I missed on my search as well.

Please only consider this after applying PULL 1045 as
it contains the required normalize_uri() function used