CI/SIR random values for each query

Better random solution