[Fixed] max indexable content size, refactored