some fixes
adapted search parameters