Fix #2 10,000 entries crash browser issue