Virtual Tags

- Started using virtual tags in the report definitions.
- Fixed compilation problem.
White Space

- White space cleanup, to avoid further git hook warnings.