Removes sticky search initiated from the tool header.
Merge branch 'release/2.0'