add filters for applications
resolve merge conflict