[ALOY-1036] Comma-separated queries are using AND instead of OR

Resolves https://jira.appcelerator.org/browse/ALOY-1036