changed query structures -> JDBCTemplate