Changed enums to match visible names in game
Adding filtering by string