Bug fix: Do not get the index of a layer automatically if layer name is supplied
Bug fix: Do not get the index of a layer automatically if layer name is supplied

TeamHG-Memex/eli5,TeamHG-Memex/eli5,TeamHG-Memex/eli5