CAL-43 fix list view template
CAL-43 merge with relooking