Goal model bug fix with server and frontend