Added ORDER BY FIELD support