final fix for currentpage queries