Added independent filter in query