SSP-921 fixing fix for demo data id issues