Improvement for ctags handling