XNAT-3138: Refactor recent upgrade to experiment listing to improve performance and readibility