Begin to fix metric filter