Modyfied table search