Fix other errors introduced in merge (LineItems controller, Interpreter model, By Date Range method)