Fix pseudo-folder content listing

Change-Id: Ib01eaea0493a294daed7032e6f9f82c2a0e8798a
Closes-Bug: #1312222
Closes-Bug: rhbz#1094783
Merge "Fix pseudo-folder content listing"