Fixed mecha-query