Reinstated the prefix based artifact selection logic
[#GRAPH-895 transition:31]