AQ: changes to handle lookup controls.