Query string optimization, take 2.