fixing URL preparation on resolving