Query string optimization, take 3.