export fixes to respect search criteria
Merge pull request #1577 from kurund/group-search

export fixes to respect search criteria