Allow composite queries
Fix display of lists