Fixed Id selection issue

Fixed Id selection issue