Some more bugfixes with indexing

We were getting bad results due to improper parsing of non-decimals