Fix issues with automatic feature and change search of annotation
@GenericInstanceClass on meta rather than on super