diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bddbc05b0d4c07863abf613ea69c7c7c36eb890..f886c899913b90ded4e0454de4c3be35b19464b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 <!-- Keep a Changelog guide -> https://keepachangelog.com -->
 
 # Solon Changelog
-## [0.0.1-M9]
+## [0.0.2-M1]
 ### Added
 - [Feature] support yml key hint
+- [Feature] Optimization of yaml support
 
 ## [0.0.1-M8]
 ### Added
diff --git a/gradle.properties b/gradle.properties
index f6ea53b15719e4d7b4ef11e21d9db457523ab309..fd7e6f461aa47cceac4e02d1984a8a0c67dc7d88 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ pluginName = Solon
 pluginRepositoryUrl = https://gitee.com/noear/solon-idea-plugin
 # SemVer format -> https://semver.org
 
-pluginVersion = 0.0.1-M9
+pluginVersion = 0.0.2-M1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 213
diff --git a/src/main/java/org/noear/solon/idea/plugin/suggestion/completion/YamlCompletionProvider.java b/src/main/java/org/noear/solon/idea/plugin/suggestion/completion/YamlCompletionProvider.java
index 95ac2e848a1a88f2d21e02c99fab77ab6ff84125..7eb0fb780740d4e618b3b6e755a1d1cbb69de072 100644
--- a/src/main/java/org/noear/solon/idea/plugin/suggestion/completion/YamlCompletionProvider.java
+++ b/src/main/java/org/noear/solon/idea/plugin/suggestion/completion/YamlCompletionProvider.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 public class YamlCompletionProvider extends CompletionProvider<CompletionParameters> {
 
-    private int hint_offset=0;
+    private final String SUB_OPTION=".";
 
     @Override
     protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet resultSet) {
@@ -45,8 +45,9 @@ public class YamlCompletionProvider extends CompletionProvider<CompletionParamet
         if (yaml != null && yaml.getParent().getClass() == YAMLKeyValueImpl.class) {
             elementBuilders = suggestionService.findHintSuggestionsForQueryPrefix(yamlKey, queryWithDotDelimitedPrefixes);
         } else if (yaml != null) {
-
-            elementBuilders = suggestionService.findYamlSuggestionsForQueryPrefix((StringUtils.isEmpty(yamlKey)?yamlKey:yamlKey+".")+queryWithDotDelimitedPrefixes);
+            yamlKey = (StringUtils.isEmpty(yamlKey)?yamlKey:yamlKey+SUB_OPTION);
+            queryWithDotDelimitedPrefixes=queryWithDotDelimitedPrefixes.equals(SUB_OPTION)?yamlKey:yamlKey+queryWithDotDelimitedPrefixes;
+            elementBuilders = suggestionService.findYamlSuggestionsForQueryPrefix(queryWithDotDelimitedPrefixes);
 
         }
         assert elementBuilders != null;
diff --git a/src/main/java/org/noear/solon/idea/plugin/suggestion/service/SuggestionServiceImpl.java b/src/main/java/org/noear/solon/idea/plugin/suggestion/service/SuggestionServiceImpl.java
index e4d648f994478c9620576de367f869e3df13d446..68455308abe8a8b963f9fbd1abee13c4b80a80b7 100644
--- a/src/main/java/org/noear/solon/idea/plugin/suggestion/service/SuggestionServiceImpl.java
+++ b/src/main/java/org/noear/solon/idea/plugin/suggestion/service/SuggestionServiceImpl.java
@@ -12,6 +12,7 @@ import com.intellij.openapi.roots.OrderEnumerator;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.apache.commons.collections4.Trie;
 import org.apache.commons.collections4.trie.PatriciaTrie;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.StopWatch;
 import org.jetbrains.annotations.Nullable;
 import org.noear.solon.idea.plugin.common.util.LoggerUtil;
@@ -210,22 +211,25 @@ public class SuggestionServiceImpl implements SuggestionService {
                 int endOffset = context.getTailOffset();
                 Document document = editor.getDocument();
                 String text = item.getLookupString();
-                String supplementText = text.substring(queryWithDotDelimitedPrefixes.length()-1);
+                boolean lastDot=queryWithDotDelimitedPrefixes.length() == queryWithDotDelimitedPrefixes.lastIndexOf(".") + 1;
+                String query = lastDot?
+                        queryWithDotDelimitedPrefixes.substring(0, queryWithDotDelimitedPrefixes.length() - 1) : queryWithDotDelimitedPrefixes;
+                String supplementText = text.substring(lastDot?query.length():query.length()-1);
+                supplementText=supplementText.indexOf(".")==0?supplementText.substring(1):supplementText;
                 String[] count = supplementText.split(DELIMITER);
                 StringBuffer resultText = new StringBuffer();
                 for (int i = 0; i < count.length; i++) {
                     resultText.append(count[i]);
                     resultText.append(YML_DELIMITER);
-                    if(i == count.length-1){
+                    if (i == count.length - 1) {
                         break;
                     }
                     resultText.append(LINE);
                     resultText.append(YML_FORMAT.repeat(i + 1));
                 }
                 text = resultText.toString();
-                System.out.println(editor.getCaretModel().getOffset());
-                document.replaceString(startOffset, endOffset, text);
-                editor.getCaretModel().moveToOffset(startOffset+text.length());
+                document.replaceString(lastDot?startOffset-1:startOffset, endOffset, text);
+                editor.getCaretModel().moveToOffset(startOffset + (lastDot?text.length()-1:text.length()));
             }));
         }
         return builders;
diff --git a/src/main/java/org/noear/solon/idea/plugin/suggestion/service/UsageProviderServiceImpl.java b/src/main/java/org/noear/solon/idea/plugin/suggestion/service/UsageProviderServiceImpl.java
index 829c4cbc6fc8393feb99cacac1ad78b7973dcec8..b1cb1d0e1e24bbf1e08bf417e6927f1096aa86c0 100644
--- a/src/main/java/org/noear/solon/idea/plugin/suggestion/service/UsageProviderServiceImpl.java
+++ b/src/main/java/org/noear/solon/idea/plugin/suggestion/service/UsageProviderServiceImpl.java
@@ -17,6 +17,7 @@ public class UsageProviderServiceImpl implements ImplicitUsageProvider {
     private final String[] CLASS_ANNOTATION = new String[]{"org.noear.solon.annotation.Controller","org.noear.solon.annotation.Configuration","org.noear.solon.annotation.Component"};
     private final String[] METHOD_ANNOTATION = new String[]{"org.noear.solon.annotation.Mapping","org.noear.solon.annotation.Bean"};
 
+
     /**
      * Class is never used
      * @param element target element