Fixes for 1997

[lrljoe]

Thanks to @mrl22 for these fixes.

See #2004 for further details.

This is pending review by @mrl22 to ensure it matches what was originally written.

All Submissions:

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?

New Feature Submissions:

1. Does your submission pass tests and did you add any new tests needed for your feature?
2. Did you update all templates (if applicable)?
3. Did you add the relevant documentation (if applicable)?
4. Did you test locally to make sure your feature works as intended?

Changes to Core Features:

• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your core changes, as applicable?
• Have you successfully ran tests with your changes locally?

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.41%. Comparing base (0c8ec45) to head (f3d4481).
Report is 142 commits behind head on development.

Additional details and impacted files

@@                Coverage Diff                @@
##             development    #2016      +/-   ##
=================================================
+ Coverage          87.30%   88.41%   +1.11%     
- Complexity          1672     1879     +207     
=================================================
  Files                150      178      +28     
  Lines               3891     4343     +452     
=================================================
+ Hits                3397     3840     +443     
- Misses               494      503       +9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[lrljoe]

Spotted another one with same behaviour (search field)