Fixed normalize criteria with user defined id