Improve Verification of Pick Changes

Issue #53: Pick Save Status is Not Accurate