Improved whereClause - added possibility to group instructions