diff --git a/ui/src/components/featureList.tsx b/ui/src/components/featureList.tsx
index 0a03eefd5..82ab0cbe5 100644
--- a/ui/src/components/featureList.tsx
+++ b/ui/src/components/featureList.tsx
@@ -221,6 +221,7 @@ const FeatureList: React.FC = () => {
         onPressEnter={onClickSearch}
       />
       <Button
+        disabled={!project}
         onClick={onClickSearch}
         type="primary"
         style={{ marginLeft: "5px" }}
diff --git a/ui/src/components/graph/graph.tsx b/ui/src/components/graph/graph.tsx
index 737a36da1..65790e4a5 100644
--- a/ui/src/components/graph/graph.tsx
+++ b/ui/src/components/graph/graph.tsx
@@ -20,6 +20,7 @@ import ReactFlow, {
 import { useSearchParams } from "react-router-dom";
 import LineageNode from "./graphNode";
 import { findNodeInElement, getLayoutedElements } from "./utils";
+import { isFeature } from "../../utils/utils";
 
 const nodeTypes = {
   "custom-node": LineageNode,
@@ -108,7 +109,8 @@ const Graph: React.FC<Props> = ({ data, nodeId }) => {
             },
             data: {
               ...element.data,
-              active: element.id === node.id,
+              active:
+                element.id === node.id && isFeature(element.data?.subtitle),
             },
           });
         }
diff --git a/ui/src/components/graph/graphNodeDetails.tsx b/ui/src/components/graph/graphNodeDetails.tsx
index 09900ff42..1637adc05 100644
--- a/ui/src/components/graph/graphNodeDetails.tsx
+++ b/ui/src/components/graph/graphNodeDetails.tsx
@@ -4,6 +4,7 @@ import { fetchFeature } from "../../api";
 import { Feature } from "../../models/model";
 import { LoadingOutlined } from "@ant-design/icons";
 import { Card, Spin, Typography } from "antd";
+import { isFeature } from "../../utils/utils";
 
 const { Title } = Typography;
 
@@ -20,13 +21,6 @@ const GraphNodeDetails: React.FC = () => {
   const [feature, setFeature] = useState<Feature>();
   const [loading, setLoading] = useState<boolean>(false);
 
-  const isFeature = (featureType: string) => {
-    return (
-      featureType === "feathr_anchor_feature_v1" ||
-      featureType === "feathr_derived_feature_v1"
-    );
-  };
-
   useEffect(() => {
     const fetchFeatureData = async () => {
       setFeature(undefined);
@@ -47,7 +41,9 @@ const GraphNodeDetails: React.FC = () => {
         <Spin indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} />
       ) : (
         <div style={{ margin: "2%" }}>
-          {!feature && <p>Click on node to show metadata and metric details</p>}
+          {!feature && (
+            <p>Click on feature node to show metadata and metric details</p>
+          )}
           {feature?.attributes.transformation && (
             <Card>
               <title>Codestin Search App</title>
diff --git a/ui/src/pages/feature/lineageGraph.tsx b/ui/src/pages/feature/lineageGraph.tsx
index 50ef51e39..1f34b2090 100644
--- a/ui/src/pages/feature/lineageGraph.tsx
+++ b/ui/src/pages/feature/lineageGraph.tsx
@@ -8,6 +8,7 @@ import { FeatureLineage } from "../../models/model";
 import { LoadingOutlined } from "@ant-design/icons";
 import GraphNodeDetails from "../../components/graph/graphNodeDetails";
 import { getElements } from "../../components/graph/utils";
+import { FeatureType } from "../../utils/utils";
 
 const { Title } = Typography;
 const { TabPane } = Tabs;
@@ -67,13 +68,13 @@ const LineageGraph: React.FC = () => {
             value={featureType}
             onChange={(e) => toggleFeatureType(e.target.value)}
           >
-            <Radio.Button value="all_nodes">All Features</Radio.Button>
-            <Radio.Button value="feathr_source_v1"> Source </Radio.Button>
-            <Radio.Button value="feathr_anchor_v1">Anchor</Radio.Button>
-            <Radio.Button value="feathr_anchor_feature_v1">
+            <Radio.Button value={FeatureType.AllNodes}>All Nodes</Radio.Button>
+            <Radio.Button value={FeatureType.Source}> Source </Radio.Button>
+            <Radio.Button value={FeatureType.Anchor}>Anchor</Radio.Button>
+            <Radio.Button value={FeatureType.AnchorFeature}>
               Anchor Feature
             </Radio.Button>
-            <Radio.Button value="feathr_derived_feature_v1">
+            <Radio.Button value={FeatureType.DerivedFeature}>
               Derived Feature
             </Radio.Button>
           </Radio.Group>
diff --git a/ui/src/utils/utils.tsx b/ui/src/utils/utils.tsx
index bf2177fad..85bfd8f42 100644
--- a/ui/src/utils/utils.tsx
+++ b/ui/src/utils/utils.tsx
@@ -21,3 +21,18 @@ export const getMsalConfig = () => {
 
   return new PublicClientApplication(msalConfig);
 };
+
+export const enum FeatureType {
+  AllNodes = "all_nodes",
+  Source = "feathr_source_v1",
+  Anchor = "feathr_anchor_v1",
+  AnchorFeature = "feathr_anchor_feature_v1",
+  DerivedFeature = "feathr_derived_feature_v1",
+}
+
+export const isFeature = (featureType: string) => {
+  return (
+    featureType === FeatureType.AnchorFeature ||
+    featureType === FeatureType.DerivedFeature
+  );
+};