Issue #31 Fix OR query with id equality