Fix - More fixes to the advanced search - Now includes search outside of current datasource