Renaming User Breaks Issue Navigator

Issue Summary

When you perform a search relating to username fields such as assignee:

assignee in ('user1')

you would be able to switch between basic and advanced search modes.

However when you rename the user, should you attempt to search the same user after correcting the name, you would not be able to change back to the basic search for the user as JIRA would keep saying "The query is too complex".

Steps to Reproduce

1. Perform the following search in issue navigator:

   assignee in ('user1')

2. Attempt to press the link to switch between basic and advanced search method
   • Expect this to succeed if the user has never been renamed.
3. Rename the user from user management page.
4. Go back to current search and update the username to match the change.

Expected Behavior

You can change between basic and Advanced search options.

Actual Behavior

The link is disabled and JIRA tells you that the query is too complex.

What I have done

I re-indexed the instance to see if this would help but it did not.