Finished: 1.2 - filters
Merge fix