Fixed issue with mapping order when no index is specified.