switch to separate index tables, added support for decimal/money