Small clean-up
Clean-up. Remove basename
DOMAIN tag added