Added url support for update
Corrected tokenizing