Nested subfilters now work, query string accurate

Change-Id: I0476462359e0fa5c957ec8145e9e329fb8a65538