Fixed issue with order by and dictionary indexes