Major search overhaul, using custom functions to search now