Simple fixes to support multiple inclusion property paths on a query.