Fixed bug: caching broke CLI tools.
Combined search padding adjustments.
Merge remote-tracking branch 'origin/master' into searchtools
Fixed checkboxes in Combined search.