- rearranged code so that the filter is completely created in class
"Filter"
- AreaName added to "ISOCodes"