Added question filtering