Tweaked some queries to increase the amount of interleaving possible