Fix selects for Institution and doctype, ListBy for DocType