Add message on empty response
Trim queries
Return after a response is sent