add support for filling in query identifier and test action in tree