Fix Bug 986071, UI for select product