Minor updates and bug fixes.

Fixed ToString short hand.
Fixed keys query when SQL Override is used.