Made query building safer
Wrapped parameters in a specific entry