Bug fixing, AJAX search almost complete