Fix some query cuke prerequisites