Fixed bug in optimizer where it didn't choose right table order in some cases