BS-8281, add index on table token