improved org. filter queries, now not based on depth.