Added support for filtered notes & preparation.