Fixed the location header expect to use && instead of ||