Fixes to indexing on Timeout table