changed url handling