Edited Staff CPT query