not tested with i18n
refactored urlwrappers handling
some todos