Fixing search_terms behavior, moving magic new stuff to magic_terms