Trying to don't lose Gid's Job
Removing X and making filter work
Merge branch 'staff_rec_names'