Cleanup admin lookup function

* Re-work admin lookup
* Optimise search queries