Adding filter titles.
Adding upstream changes.