Update new index mappings if selecting from existing index (#670) (#674)

Update new index mappings if selecting from existing index (#670) (#674) #410