Added map to guarantee that redirect scheme is always set.  Modified location to use that variable.