DSSSM-709 #time 16m Restructuring handling for populating search fields for search results pages