Adding maxdepth and avoiding duplicating titles. Change-Id: Iea36b58de05b5e113f7db7e5358b5b3b912a0d8d