MIFOSX-966 Better Bread Crumbs

Part of GCI task: http://www.google-melange.com/gci/task/view/google/gci2014/5263837527801856

This also uncomments the code to allow search retaining for Clients and Users, which will cause errors in test