added dynamic tags completion