Refactored search filter prefix/suffix to be more unique and added comments