CSM349 Additional Queries Fixed Except One