Yes, it's the goal. But we'll do that in a other PR, there are others improvement to do in the .htaccess file