Updated Search Functionality

[apoisonedgift]

Excellent to see these changes rolling out! Looking forward to the rest coming