Fix search box suggestions, fixes #5665

Add draft filter only when it's needed