add debug logging entries, fix issue with single quotes