Apply template filtering to instrument wizard too.

Also fix selection of current template in instrument type combo box.
Fix build error.