dev: Clean up grammar search in pacemaker
dev: This commit exposes bug introduced with Schema refactoring