feature #1664: Fix unselect on refresh bug
feature #1664: Fix for vectorial templates