fix RT 87287 with implicit AND/OR logic switch