- fixed url parsing (using hashmap's)