handling different dict formats better for FHVisitor