Bug Fix: Handle multivalue dicts