You’ve already suggested the permanent solution to your problem 
Subfolder Install will continue to have quirks like this because it’s neither recommend nor massively adopted. Those who have reasons to use subfolder usually have to report these issues all the times to get them fixed.
So my best recommendation to you is to use a subdomain and call it a day.