Keyword search clears but does not disable
Merge branch 'fix-list-2014-03-31'