Small changes to the query

I did not understand why you were not using NAMED STREAM here, but I may be wrong.