changed keywords functionality (added suffixes support)