Fix to address empty tags