fix short tag and aviary inclusion