Improve record loading (client side)