fix lookup
fix ui