Fix adding, preliminary scrollTo
Prepare for good filter