Restored Q/placeholders logic, it was sound