Tweaked query.