updated to use client side search