Another bugfix : the replacer with AND & OR queries