Fixing up calls through to server to ensure indices are used from supplied list