bug fix: some 'fromOr's weren't changed to 'fromAnd' after copy & paste