diff --git a/homeassistant/components/conversation/services.yaml b/homeassistant/components/conversation/services.yaml
index 032edba8db1..5c85de7c187 100644
--- a/homeassistant/components/conversation/services.yaml
+++ b/homeassistant/components/conversation/services.yaml
@@ -1,7 +1,10 @@
 # Describes the format for available component services
 process:
-  description: Launch a conversation from a transcribed text.
+  description: Launch a conversation from a transcribed text
   fields:
     text:
+      name: Text
       description: Transcribed text
       example: Turn all lights on
+      selector:
+        text:
diff --git a/homeassistant/components/image_processing/services.yaml b/homeassistant/components/image_processing/services.yaml
index 69e455344b0..cd074acd9f4 100644
--- a/homeassistant/components/image_processing/services.yaml
+++ b/homeassistant/components/image_processing/services.yaml
@@ -1,8 +1,5 @@
 # Describes the format for available image processing services
 
 scan:
-  description: Process an image immediately.
-  fields:
-    entity_id:
-      description: Name(s) of entities to scan immediately.
-      example: "image_processing.alpr_garage"
+  description: Process an image immediately
+  target:
diff --git a/homeassistant/components/number/services.yaml b/homeassistant/components/number/services.yaml
index d18416f9974..4cb0cf09829 100644
--- a/homeassistant/components/number/services.yaml
+++ b/homeassistant/components/number/services.yaml
@@ -1,11 +1,12 @@
 # Describes the format for available Number entity services
 
 set_value:
-  description: Set the value of a Number entity.
+  description: Set the value of a Number entity
+  target:
   fields:
-    entity_id:
-      description: Entity ID of the Number to set the new value.
-      example: number.volume
     value:
+      name: Value
       description: The target value the entity should be set to.
       example: 42
+      selector:
+        text: