I find it very annoying that escorts have both of these options on every favorites tab.

Surely it can't be both.

If need be I will make the modification myself to the code for no charge, but...