Use default context sort order when returning autocomplete

Fixes #1403