Add regexp serach and field selection