Probably not the solution you are looking for but I would consider setting up each Week as a panel in a Layout. Panel on the Left would hold the Editable Query for Week 30. Panel on the Right would hold the Editable Query for Week 31.
Would also allow you to have Left/Right Arrows in a toolbar to navigate Weeks forward and backward.
Just an idea