hbt+: an improved code for finding subhaloes and building merger trees in cosmological simulations | Synapse