added handling for urlwrappers