add better support to non map values in :with