added parameters in choice from
changed activities syntax
changed dpt search tops comparison logic