Resolve "Optimize use of categories in search"

I have provided

• Source code documentation
• Project documentation
• Unit tests
• at least one commit of the type fix or feature that closes a referenced issue.

Closes #455 (closed)