Regression from #3132480: options_show_only_used no longer works

Problem/Motivation

Using options_show_only_used will skip all filled values for full result since #3132480 introduced an if/else condition where the else block is executed on line 142 when options_show_only_used_filtered is not enabled:

else {
  // In this case we need to skip all filled values for full result.
  foreach ($query_param->keys() as $key) {
    $query_param->remove($key);
  }
}

Steps to reproduce

Enable options_show_only_used and disable options_show_only_used_filtered.

Proposed resolution

Both the if/else code blocks need to be ignored in this case to restore the previous functionality.

Remaining tasks

User interface changes

API changes

Data model changes