Add results verification
Remove reference to query result when changing data source
Apply filters only when available