More hacks to make hypertargets for different tables distinct