Ported Extra Form Sync- and Search-Functionality to Dev-Branch