Fix MAGN-1967; Clean up some AST nodes
Fix MAGN-2089, MAGN-2088: Rename categories in library view
Fix MAGN-2094: support whitespace in search string
Sanitize query string in search view
Merge remote-tracking branch 'upstream/ChocoButter-2Become1' into ChocoButter-2Become1
Merge pull request #1213 from ke-yu/ChocoButter-2Become1

Fix MAGN-1967; Clean up some AST nodes