Fix for multiple AND conditions on the same name