add missing template

• fix filter query
• fix inappropriate var names