Big revision on search functions
Adding search highlight; swapping out for mixins