Fixes for sort field options