Fixed world 1-1.xml, refactored filters