Data Driven Spawning problem

Data-driven spawning does not work when minecraft:spawns_on_block_filter is used with a block that needs a data value to identify it.

Example this works perfectly as intended to spawn entities only on sand blocks

"minecraft:spawns_on_block_filter": "minecraft:sand"

 

The next two examples do not work

"minecraft:spawns_on_block_filter": "minecraft:stone:2", //Spawn on Diorite

"minecraft:spawns_on_block_filter": "minecraft:stained_hardened_clay:15", // spawn on Black Terracotta

I have tried quite a few variations in spawning and syntax but it seems to boild down to this problem.

Thanks