More URL state manager refactoring