Better detection for tapping on upgradeItem