Fixed additional critiera, removed some unencoded characters