Filtering on tree page, other fixes