Fixed an issue with non string values not displaying in results grid.
Future proofed some code parts for things I would like to do some time.
