chris kneisler's changes to handle combo boxes with integration fixes