admin path fix and optimisation