Move textual search fields into content dictionary