Fixing featuresOnly logic