+1, and it would also solve the `redirect_map` problem I think :)