Regression of CONFSERVER-38036 Confluence Attachment search does not work if the attachment name has hyphen "-"

Problem

I have uploaded an attachment which has hyphen("-") in its name, to a confluence page.
When I try to search the attachment by clicking "insert -> images -> Search -> This space",
attachment was not found in Search result.
Confluence Search is not able to find the attachment if it has "-" in the name.

Environment

Confluence Data Center LTS 7.13.4

Steps to Reproduce

• Upload an attachment which has "-" in it's name to a confluence page.(Ex: image2021-3-9_10-39-48.png)
• Edit the page and try to embed the attached image on this page by clicking "images => Search => This space".
• Enter the search string as "image2021-3-9_10-39-48" and search.
• Even though attachment exists, it will not be displayed while searching with search string "image2021-3-9_10-39-48".

Note: you can also rename a file and re-upload it to easily observe this behavior.

Expected Results

• Able to find the attachment using the filename with hyphens

Actual Results

• Unable to find the attachment using the filename with hyphens
• Able to find the attachment using partial alphanumeric string including spaces, but not with hyphens

Workaround

• No workaround for this is available, but modifying search string terms could help or changing scoping on the search filter.

Notes

This was first noticed in an older version of Confluence as exposed in CONFSERVER-38036, and was fixed, but now shows back up again in the current LTS branch