Added possibility to filter by supply point