Fixed annotation tags.  Tags were not being flattened to the parent causing queries to return empty.