Remove unused url encoded string
Support non-required extensions

Closes #360