Fixing Sonar Problems ( ReservationMgrServiceImplQuery & Building)