Pets and Organizations Controller actions reworked