Fix CLICK_EITHER, ENTITY_EITHER and BLOCK_EITHER