add search router to the element definition; bugfixes;