Update primary keys on analysis descriptor to include experiment keys
Fix query error in naive analysis experiment