DRYing things out, making metadata objects a little more flexible, making saved search parts actually work