Fix pseudo-folder content listing

Change-Id: Ib01eaea0493a294daed7032e6f9f82c2a0e8798a
Closes-Bug: #1312222
Closes-Bug: rhbz#1094783
(cherry picked from commit dceb2cc8d6f0f02e1f741d82097861a950cd951b)