Primary key picture, bug with failure after double clisk fixed, corrections with primary keys logic