Add the name prefix index back in for now until I fix the custom table option.