Fix logic in Registry dealing with empty fields