Fixed rewrite flows to add ip and mac rewrite