Modified search in project and task

Only show the countries, themes and skills that are actually used for projects/tasks
Merge pull request #188 from sergei-maertens/integration

Modified search in project and task