Token on API requests
Cleanup some old bits
remove double escaping of where items