Fix query string construction with AND keyword