Fix offline eval command template and regression