CSPACE-5265: Implement Ray's fix for two issues relating to performing s...

...imple searches on the Advanced Search page.