Add overlay key, remove nulls