improved space matching for find all