added db indexes on lookup fields