Continuing work on registration
Fixed some things in search-content