Make column detection more robust

Prevent a field name containing the string "FROM" from borking the query
parsing. Not perfect, as a field named "SEND FROM" would still cause a
problem - but better than right now.
remove need for @

Probably needs refactoring - doesn't need @list