CSPACE-5265: Implement Ray's fix for two issues relating to performing simple searches on the Advanced Search page.
Merge pull request #203 from aronr/CSPACE-5265

CSPACE-5265: Implement Ray's fix for two issues relating to performing s...
CODE-30: Add comments.
CODE-30: Fix a comment.
CODE-30: Clean up whitespace.
CODE-30: Clean up demands.
Merge branch 'master' into CODE-30