Fix for #436 and #223 - proper parsing of span queries and not-concatenating field:foo bar