search is way better now from DB