Bugfixes
AJAX Controller fix
Tests updated