-ADD notification sorting support and history refactoring
merge