Improve filtering of programmes and projects.