Update after feedback for ignoring schemes in URL