fixed Issue #1: filtered invalid keys on updating