Corrects maps and detects and fixes some crashes for filters.
Merge branch 'release/1.1' into develop