Fixes issue with 'no restaurants' and with 'no notification'.