Improve the way filter strings are constructed for complicated queries

[martinallison]

I.e. don't assume that every filter is just of the form "%s (<|<=|>|>=|=|:) %s" because this won't work for the search API's 'distance' queries on GeoFields