Issue 35

Added checks for fields that are already quoted or contain a function.