AAD-79: filtering fix