Fix JS inclusion order
Fix filtering in selectable contact location