Added data filter in query results