Fix query injection, weird messages