Adding AP State to Events
Fixing more ASCII issues in database