I'd like to see us separate the model and view for all this filter stuff sooner rather than later.  Shouldn't be dealing with CQL until the moment that a download request is sent off...