Try to improve entity redirection.