fixed partial select logic