Better category assignment + search category label

#5