Also resolving queries from server where pi-hole is running on

You can always make the appropriate edit, then lock the file. See here: Make Raspberry Pi not use pihole for its own DNS - #9 by firestorrrm