Feature/45 enable lookup fields