fixed subsetting bugs in cleanup

added merge of store features