diff --git a/pkg/apis/controller/common/v1beta1/common_types.go b/pkg/apis/controller/common/v1beta1/common_types.go
index d2109ac18c2..0363d76e58f 100644
--- a/pkg/apis/controller/common/v1beta1/common_types.go
+++ b/pkg/apis/controller/common/v1beta1/common_types.go
@@ -17,8 +17,8 @@ limitations under the License.
 package v1beta1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
 )
 
 // AlgorithmSpec is the specification for a HP or NAS algorithm.
@@ -31,7 +31,7 @@ type AlgorithmSpec struct {
 	AlgorithmSettings []AlgorithmSetting `json:"algorithmSettings,omitempty"`
 
 	// Suggestion service Deployment spec
-	SuggestionSpec appsv1.DeploymentSpec `json:suggestionSpec,omitempty`
+	SuggestionSpec appsv1.DeploymentSpec `json:"suggestionSpec,omitempty"`
 }
 
 // AlgorithmSetting represents key-value pair for HP or NAS algorithm settings.
diff --git a/pkg/controller.v1beta1/suggestion/suggestion_controller.go b/pkg/controller.v1beta1/suggestion/suggestion_controller.go
index e5aa42e2fa1..84aa91f8540 100644
--- a/pkg/controller.v1beta1/suggestion/suggestion_controller.go
+++ b/pkg/controller.v1beta1/suggestion/suggestion_controller.go
@@ -194,7 +194,7 @@ func (r *ReconcileSuggestion) ReconcileSuggestion(instance *suggestionsv1beta1.S
 	suggestionNsName := types.NamespacedName{Name: instance.GetName(), Namespace: instance.GetNamespace()}
 	logger := log.WithValues("Suggestion", suggestionNsName)
 
-	// TODO(a9p): the next few blocks are from config.go::GetSuggestionConfigData, 
+	// TODO(a9p): the next few blocks are from config.go::GetSuggestionConfigData,
 	//            this should be pulled out into a utility function if correct
 	// Get katib config map
 	configMap := &corev1.ConfigMap{}
@@ -215,7 +215,7 @@ func (r *ReconcileSuggestion) ReconcileSuggestion(instance *suggestionsv1beta1.S
 			return err
 		}
 		// Try to find SuggestionConfig for the algorithm
-		suggestionConfigData, _ = suggestionsConfig[instance.Spec.Algorithm.AlgorithmName]
+		suggestionConfigData = suggestionsConfig[instance.Spec.Algorithm.AlgorithmName]
 	}
 
 	// If ResumePolicy is FromVolume or PersistentVolumeClaimSpec provided, volume is reconciled for suggestion
diff --git a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go
index 11f7eac6615..6a971d08f22 100644
--- a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go
+++ b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go
@@ -301,7 +301,7 @@ func (g *General) ConvertExperiment(s *suggestionsv1beta1.Suggestion, e *experim
 		Algorithm: &suggestionapi.AlgorithmSpec{
 			AlgorithmName:     e.Spec.Algorithm.AlgorithmName,
 			AlgorithmSettings: convertAlgorithmSettings(e.Spec.Algorithm.AlgorithmSettings),
-			SuggestionSpec: s.Spec.Algorithm.SuggestionSpec.DeepCopy(),
+			SuggestionSpec:    s.Spec.Algorithm.SuggestionSpec.DeepCopy(),
 		},
 		Objective: &suggestionapi.ObjectiveSpec{
 			Type:                  convertObjectiveType(e.Spec.Objective.Type),
diff --git a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go
index 1015e5ed157..012671a75a8 100644
--- a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go
+++ b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go
@@ -28,6 +28,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -976,6 +977,7 @@ func newFakeRequest() *suggestionapi.GetSuggestionsRequest {
 							Value: "value",
 						},
 					},
+					SuggestionSpec: &appsv1.DeploymentSpec{},
 				},
 				EarlyStopping: &suggestionapi.EarlyStoppingSpec{
 					AlgorithmName: earlyStoppingAlgorithmName,