Added additional indexed fields using "indexed" instead of "_indexed", to work around naming limitations