SQL._parse_filter refactored

Moved code from SQL._datasource into a separate method that is also called by SQL._datasource_ex.  Without this, the combine_queries method blows up.