CFY-1093 added prefix and suffix to spot relevant data