CSM349 Last of the Additional Queries Fixed