Fix a bug for tag autocomplete
Merge branch 'jereze-patch-1' into develop