Template selector works better now