Feature/400 bad request