fix bug 22 andpart of 34
remove constant store_id
fix merge conflict