Added url quote, few minor modifications