refs ZEN-7297 we calling SelectByToken twice which was messing up the re...

...ndering of the details page