fix app & notifications logic