Added the option to add the a restriciton value predicate on query level
Updated copy and fixed a bug when the first restriciton in a group is ignored