temporary fix for lookup fields