Query string optimization, take 6.