CORS working; also fixed an issue where urls containing ?|#|& were not found