issue #19930: fixed quote address search

this is just one commit that builds on the great big address pull request.