More cleanup for contained resources
Fix #33 - Server was incorrectly returning contained resources as
top-level resources