Tune regexp to work only with separate words, attempt 2