Optimised maintainer query