Fixed templates to better support detail show variable