export fixes to respect search criteria