Add some more db indexes to assist with query performance