Embedding, filtering and sorting not supported anymore
Minor rewrites
Add record validation