Locate by layer - improve autocomplete