removed block, changed inline key-tag logic