Add new keywords for module categorization

Also simplify the modules search API