Merge "improve selecting filenames of tempalte and mapping"