Refactored with handmade solution with a class correctly returned using form-group method