fix(variable): Add 'and' in where-clause

related to CAM-941