UPDATE: search is coming along better now, still not pretty