Enabled ordering support and fixed unquoted keyword bug