Fixed some performance improvements when deepLoad is set to false.