fix false match when field renamed
do not need to add matcher when array entry is nil
notes and minor refactor