fixing notification and search optimization