changes by karim to uri_handler