IDEX-1524: improve notification