added name map for suggestions
updated filters