fixes on empty element
updates