template-picker bug fix

Signed-off-by: azrael <azrael@imatlas.com>