A bit more prefetch still a mess of queries....