Changes for accepted empty tags