[CDA-15] Solved problem of assigning values ​​to parameters

Problem solved. Tests included

Please review

@pmalves 
What's the purpose of reintroducing the value of the original query here ?