Breaks layout after Drupal 9.1 update

Hi there
Patch #2 worked well for me on Drupal 9.1. On Drupal 10, however, the range filter is no longer rendered.
I adjusted the patch, so the fields are restored.

I have slightly tweaked @danielwirz patch to remove an additional div wrapper that had crept in. This keeps the markup in line with the previous patch and will avoid css selector issues (which is what I suffered from)

I've updated the changes from #5 for 3.x and created a fork/MR.

Unfortunately this breaks the geofield proximity filter from showing as there is only one wrapper not two

Fixed the breaking changes from #11