Major Update

Flexible Staff query
Update