Added URLquery and the ability to encode a map target.