Add search keys to core data tables