fix #19 Mammoth store parsing enhancements