Completion for fields with fixed values range added, completion for top-level fields improved