closeOnPopupCloseClick added