OATT-17 Fix integration between frontend and backend