Quick Filtering / Search Messages Bar Missing Subject, Sender, Body?

In the most recent Thunderbird release, the quick filter/search bar functionality has changed and is now either global (ctrl-K) or can only be engaged once a global search is completed (CTRL-SHIFT-K). I want my single quick filter/search bar back with the three buttons for subject, sender, body - back. It is a complete waste of time to have to do a global search every time, then click "show as list" and then "maybe" be able to sub-search by subject, sender, body.