Made some efficiency modifications in hopes of lowering results load time.