Fix: structures matched

comparing unmatched values only if not empty