diff --git a/assets/app.js b/assets/app.js
index 9c189e3..114ed3f 100644
--- a/assets/app.js
+++ b/assets/app.js
@@ -1,4 +1,8 @@
-import 'htmx.org';
+import htmx from 'htmx.org'
+htmx.config.includeIndicatorStyles = false
+htmx.config.historyCacheSize = 0
+htmx.config.allowScriptTags = false
+
 import './bootstrap.js';
 /*
  * Welcome to your app's main JavaScript file!
diff --git a/src/Form/TeamerApplicationType.php b/src/Form/TeamerApplicationType.php
index ce7d09f..7964b42 100644
--- a/src/Form/TeamerApplicationType.php
+++ b/src/Form/TeamerApplicationType.php
@@ -35,11 +35,17 @@ class TeamerApplicationType extends AbstractType
                 }
 
                 $assignment = $application->getAssignment();
+                $pickups = $assignment->getDestination()->getPickups();
+
+                if (0 === count($pickups)) {
+                    return;
+                }
+
                 $teamer = $application->getTeamer();
 
                 if (0 === (int) $assignment->getPickup()) {
                     $pickupChoices = [];
-                    foreach ($assignment->getDestination()->getPickups() as $pickup) {
+                    foreach ($pickups as $pickup) {
                         $pickupChoices[$pickup['city']] = $pickup['busProId'];
                     }
                     ksort($pickupChoices);
diff --git a/src/Repository/AssignmentRepository.php b/src/Repository/AssignmentRepository.php
index 4951af4..e3bb112 100644
--- a/src/Repository/AssignmentRepository.php
+++ b/src/Repository/AssignmentRepository.php
@@ -244,6 +244,7 @@ class AssignmentRepository extends ServiceEntityRepository
             ->leftJoin('assignment.dispositions', 'disposition', Join::WITH, $qb->expr()->eq('disposition.teamer', ':teamer'))
             ->where($qb->expr()->andX(
                 $qb->expr()->eq('assignment.status', ':status'),
+                $qb->expr()->neq('assignment.staffingStatus', ':staffingStatus'),
                 $qb->expr()->in('assignment.jobProfile', ':jobProfiles'),
                 $qb->expr()->isNull('application'),
                 $qb->expr()->isNull('disposition'),
@@ -253,6 +254,7 @@ class AssignmentRepository extends ServiceEntityRepository
                 )
             ))
             ->setParameter('status', Assignment::STATUS_PUBLISHED)
+            ->setParameter('staffingStatus', Assignment::STATUS_STAFFED)
             ->setParameter('jobProfiles', $teamer->getJobProfiles())
             ->setParameter('teamer', $teamer)
             ->setParameter('dateFrom', new \DateTimeImmutable())