Change no entry storage to use longs and doubles instead of strings
Change no entry storage to use longs and doubles instead of strings
merge fixes