made all tolerant of unnamespaced components