Resolved conflict with filtering
Done with finding closest facility
Merged from jonas