Payee category should be used only if I don't manually set the category for transaction

Since ‘Category’ field is above ‘Payee’ in Transaction creation dialog, I set it first, then set Payee. When Payee has its’ related category set (for example, I set ‘Groceries’ for every ‘Shop’) AND for THIS specific transaction I want ANOTHER category to be used (for example, I manually select ‘Tipps’ when I tip, and it goes as a separate transaction) - the category from the Payee overwrites back my manually selected Category of the transaction (in this case, ‘Tipps’ becomes ‘Groceries’). and since I don’t pay attention to that change (remember, Category field is configured BEFORE Payee field), I save the transaction in an incorrect state. Only later, when I look in the list of transactions, I can manually spot such errors. Currently, the only options to ‘fix’ that are:

1. make a habit to configure Category AFTER Payee. not good, since it’s contra to the order of the fields (from upper to lower);

2. remove all Categories from Payees, and choose Category for each transaction manually. better, but still I want to use Payee’s Category 95% of the time, with only occasionally changing it, so it looks like a waste of time

Please make any of the following changes to the app:

1. Move Payee field above Category in Transaction creation dialog (so we choose it first, and it prepopulates the Category and other fields). this may seems logical, since Payee ‘controls’ these fields.

2. Make Payee’s Category be applied ONLY if there is no already selected Category in the transaction.