Added category support for autocompletion functionality