Revert "fixed whitespaces"

This reverts commit 5384463231f4e66a3bc1608ab163b841074a89bf.
Revert "Fixed field navigation in DataSource.filter"

This reverts commit b06f2755939ac7a6171ae334de321a3339bcb347.