Moved show-data function into querying module.

Also updated various includes.