More refactoring for lookup fancy controls