Fixed annotation parsing and insert query construction