datastore/featureset separation
add feature bug resolution