Complete the query setup before setting up the wp table
Reorder stuff in the work packages angular controller