Improve category completion