HOTFIX: Bug in filters APD-346