ZSS-646: Apply filter incorrectly when contained merged cells