Use proper sorting
Use time to index notifications