add more indexes
update formage config