Add urlencoding of objects too