* Re-work admin lookup
 * Optimise search queries
Merge pull request #243 from iseppi/fix-lookup

Cleanup admin lookup function