the "main" query for each of these improved by ~3-10x.