Refactored queries and removed variable interpolation.