Only insert the best claims into the store

Fixes bug 64431 and bug 64895