Fix ManyToOne filter and Enable OR condition