Fix search command filter
Merge remote-tracking branch 'chiiph/bug/fix-search-command-filter' into develop