Added table support
Store label decrypted so search works