Request evaluator fixes