better URL handling --KW