Fixed other pessimized queries