Merge ang's relevancy fix, rewrite statements with PreparedStatement